[vlc-commits] include: split the color range from the color space with a boolean

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Sun Apr 17 11:05:50 2016 +0300| [f846cb3af9058eb31d4594642ca0df69ac4c1913] | committer: Thomas Guillem

include: split the color range from the color space with a boolean

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f846cb3af9058eb31d4594642ca0df69ac4c1913
---

 include/vlc_es.h          |   12 ++++--------
 modules/hw/vdpau/chroma.c |    2 --
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 9b582cc..4596a4c 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -224,14 +224,9 @@ typedef enum video_transfer_func_t
 typedef enum video_color_space_t
 {
     COLOR_SPACE_UNDEF,
-    COLOR_SPACE_BT601_LIMITED,
-#define COLOR_SPACE_BT601 COLOR_SPACE_BT601_LIMITED
-    COLOR_SPACE_BT601_FULL,
-    COLOR_SPACE_BT709_LIMITED,
-#define COLOR_SPACE_BT709 COLOR_SPACE_BT709_LIMITED
-    COLOR_SPACE_BT709_FULL,
-    COLOR_SPACE_BT2020_LIMITED,
-#define COLOR_SPACE_BT2020 COLOR_SPACE_BT2020_LIMITED
+    COLOR_SPACE_BT601,
+    COLOR_SPACE_BT709,
+    COLOR_SPACE_BT2020,
 } video_color_space_t;
 
 /**
@@ -265,6 +260,7 @@ struct video_format_t
     video_color_primaries_t primaries;                  /**< color primaries */
     video_transfer_func_t transfer;                   /**< transfer function */
     video_color_space_t space;                        /**< YCbCr color space */
+    bool b_color_range_full;                    /**< 0-255 instead of 16-235 */
 };
 
 /**
diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c
index ffdd649..a42aed2 100644
--- a/modules/hw/vdpau/chroma.c
+++ b/modules/hw/vdpau/chroma.c
@@ -71,11 +71,9 @@ static VdpStatus MixerSetupColors(filter_t *filter, const VdpProcamp *procamp,
     switch (filter->fmt_in.video.space)
     {
         case COLOR_SPACE_BT601:
-        case COLOR_SPACE_BT601_FULL: /* FIXME: wrong, use custom CSC */
             std = VDP_COLOR_STANDARD_ITUR_BT_601;
             break;
         case COLOR_SPACE_BT709:
-        case COLOR_SPACE_BT709_FULL: /* FIXME: same as above */
             std = VDP_COLOR_STANDARD_ITUR_BT_709;
             break;
         default: