From 568429512eb932b7576a50c563b77db271a13e8e Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Fri, 16 Oct 2015 16:25:08 -0700 Subject: [PATCH] Add a new enum type vpx_color_range_t to make meaning of color_range obvious. Change-Id: I303582e448b82b3203b497e27b22601cc718dfff --- test/vp9_encoder_parms_get_to_decoder.cc | 10 +++++----- vp9/common/vp9_onyxc_int.h | 2 +- vp9/decoder/vp9_decodeframe.c | 7 +++---- vp9/encoder/vp9_encoder.h | 2 +- vp9/vp9_cx_iface.c | 5 +++-- vpx/vpx_image.h | 8 +++++++- vpx_scale/yv12config.h | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/test/vp9_encoder_parms_get_to_decoder.cc b/test/vp9_encoder_parms_get_to_decoder.cc index 0984e6a42..6dc7d2f9e 100644 --- a/test/vp9_encoder_parms_get_to_decoder.cc +++ b/test/vp9_encoder_parms_get_to_decoder.cc @@ -40,17 +40,17 @@ struct EncodeParameters { int32_t lossless; int32_t error_resilient; int32_t frame_parallel; - int32_t color_range; + vpx_color_range_t color_range; vpx_color_space_t cs; int render_size[2]; // TODO(JBB): quantizers / bitrate }; const EncodeParameters kVP9EncodeParameterSet[] = { - {0, 0, 0, 1, 0, 0, VPX_CS_BT_601}, - {0, 0, 0, 0, 0, 1, VPX_CS_BT_709}, - {0, 0, 1, 0, 0, 1, VPX_CS_BT_2020}, - {0, 2, 0, 0, 1, 0, VPX_CS_UNKNOWN, { 640, 480 }}, + {0, 0, 0, 1, 0, VPX_CR_STUDIO_RANGE, VPX_CS_BT_601}, + {0, 0, 0, 0, 0, VPX_CR_FULL_RANGE, VPX_CS_BT_709}, + {0, 0, 1, 0, 0, VPX_CR_FULL_RANGE, VPX_CS_BT_2020}, + {0, 2, 0, 0, 1, VPX_CR_STUDIO_RANGE, VPX_CS_UNKNOWN, { 640, 480 }}, // TODO(JBB): Test profiles (requires more work). }; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 90bde5552..ceffdedf9 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -112,7 +112,7 @@ typedef struct BufferPool { typedef struct VP9Common { struct vpx_internal_error_info error; vpx_color_space_t color_space; - int color_range; + vpx_color_range_t color_range; int width; int height; int render_width; diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 8f20686f2..f1916639b 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1795,8 +1795,7 @@ static void read_bitdepth_colorspace_sampling( } cm->color_space = vpx_rb_read_literal(rb, 3); if (cm->color_space != VPX_CS_SRGB) { - // [16,235] (including xvycc) vs [0,255] range - cm->color_range = vpx_rb_read_bit(rb); + cm->color_range = (vpx_color_range_t)vpx_rb_read_bit(rb); if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { cm->subsampling_x = vpx_rb_read_bit(rb); cm->subsampling_y = vpx_rb_read_bit(rb); @@ -1810,7 +1809,7 @@ static void read_bitdepth_colorspace_sampling( cm->subsampling_y = cm->subsampling_x = 1; } } else { - cm->color_range = 1; + cm->color_range = VPX_CR_FULL_RANGE; if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { // Note if colorspace is SRGB then 4:4:4 chroma sampling is assumed. // 4:2:2 or 4:4:0 chroma sampling is not allowed. @@ -1916,7 +1915,7 @@ static size_t read_uncompressed_header(VP9Decoder *pbi, // specifies that the default color format should be YUV 4:2:0 in this // case (normative). cm->color_space = VPX_CS_BT_601; - cm->color_range = 0; + cm->color_range = VPX_CR_STUDIO_RANGE; cm->subsampling_y = cm->subsampling_x = 1; cm->bit_depth = VPX_BITS_8; #if CONFIG_VP9_HIGHBITDEPTH diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 174e2b461..159c03aa8 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -238,7 +238,7 @@ typedef struct VP9EncoderConfig { int use_highbitdepth; #endif vpx_color_space_t color_space; - int color_range; + vpx_color_range_t color_range; int render_width; int render_height; VP9E_TEMPORAL_LAYERING_MODE temporal_layering_mode; diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index e36a04475..b54c985d1 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -45,7 +45,7 @@ struct vp9_extracfg { vpx_bit_depth_t bit_depth; vp9e_tune_content content; vpx_color_space_t color_space; - int color_range; + vpx_color_range_t color_range; int render_width; int render_height; }; @@ -327,7 +327,8 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, ERROR("Codec bit-depth 8 not supported in profile > 1"); } RANGE_CHECK(extra_cfg, color_space, VPX_CS_UNKNOWN, VPX_CS_SRGB); - RANGE_CHECK(extra_cfg, color_range, 0, 2); + RANGE_CHECK(extra_cfg, color_range, + VPX_CR_STUDIO_RANGE, VPX_CR_FULL_RANGE); return VPX_CODEC_OK; } diff --git a/vpx/vpx_image.h b/vpx/vpx_image.h index 51100599c..e9e952c48 100644 --- a/vpx/vpx_image.h +++ b/vpx/vpx_image.h @@ -78,11 +78,17 @@ extern "C" { VPX_CS_SRGB = 7 /**< sRGB */ } vpx_color_space_t; /**< alias for enum vpx_color_space */ + /*!\brief List of supported color range */ + typedef enum vpx_color_range { + VPX_CR_STUDIO_RANGE = 0, /**< Y [16..235], UV [16..240] */ + VPX_CR_FULL_RANGE = 1 /**< YUV/RGB [0..255] */ + } vpx_color_range_t; /**< alias for enum vpx_color_range */ + /**\brief Image Descriptor */ typedef struct vpx_image { vpx_img_fmt_t fmt; /**< Image Format */ vpx_color_space_t cs; /**< Color Space */ - int range; /**< Limited (0) vs. Full-range (1) sample data */ + vpx_color_range_t range; /**< Color Range */ /* Image storage dimensions */ unsigned int w; /**< Stored image width */ diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index 3a044526e..37b255d4d 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -56,7 +56,7 @@ typedef struct yv12_buffer_config { int subsampling_y; unsigned int bit_depth; vpx_color_space_t color_space; - int color_range; + vpx_color_range_t color_range; int render_width; int render_height;