From 41eb20d1e9171aae6da2ec041786b1235f3d1f1a Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Tue, 13 Jan 2015 10:07:20 -0800 Subject: [PATCH] Add encoder control for setting color space This commit adds encoder side control for vp9 to set color space info in the output compressed bitstream. It also amends the "vp9_encoder_params_get_to_decoder" test to verify the correct color space information is passed from the encoder end to decoder end. Change-Id: Ibf5fba2edcb2a8dc37557f6fae5c7816efa52650 (cherry picked from commit e94b415c3479129944a69fafbeacf550fb9237b7) --- vp9/common/vp9_enums.h | 11 ----------- vp9/common/vp9_onyxc_int.h | 2 +- vp9/decoder/vp9_decodeframe.c | 6 +++--- vp9/encoder/vp9_bitstream.c | 2 +- vp9/encoder/vp9_encoder.c | 1 + vp9/encoder/vp9_encoder.h | 2 +- vp9/vp9_cx_iface.c | 16 ++++++++++++---- vpx/vp8cx.h | 19 ++++++++++++++++++- vpxenc.c | 2 +- 9 files changed, 38 insertions(+), 23 deletions(-) diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index c23aa52e9..81f99f37f 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -151,17 +151,6 @@ typedef enum { } PALETTE_RUN_LENGTH; #endif -typedef enum { - UNKNOWN = 0, - BT_601 = 1, // YUV - BT_709 = 2, // YUV - SMPTE_170 = 3, // YUV - SMPTE_240 = 4, // YUV - RESERVED_1 = 5, - RESERVED_2 = 6, - SRGB = 7 // RGB -} COLOR_SPACE; - typedef enum { VP9_LAST_FLAG = 1 << 0, VP9_GOLD_FLAG = 1 << 1, diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 686780c29..ce39214d6 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -69,7 +69,7 @@ typedef struct VP9Common { DECLARE_ALIGNED(16, int16_t, y_dequant[QINDEX_RANGE][8]); DECLARE_ALIGNED(16, int16_t, uv_dequant[QINDEX_RANGE][8]); - COLOR_SPACE color_space; + vpx_color_space_t color_space; int width; int height; diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index e4eefb9b8..fc07ce434 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1976,8 +1976,8 @@ static void read_bitdepth_colorspace_sampling( cm->use_highbitdepth = 0; #endif } - cm->color_space = (COLOR_SPACE)vp9_rb_read_literal(rb, 3); - if (cm->color_space != SRGB) { + cm->color_space = vp9_rb_read_literal(rb, 3); + if (cm->color_space != VPX_CS_SRGB) { vp9_rb_read_bit(rb); // [16,235] (including xvycc) vs [0,255] range if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { cm->subsampling_x = vp9_rb_read_bit(rb); @@ -2077,7 +2077,7 @@ static size_t read_uncompressed_header(VP9Decoder *pbi, // of either the color format or color sub-sampling in profile 0. VP9 // specifies that the default color space should be YUV 4:2:0 in this // case (normative). - cm->color_space = BT_601; + cm->color_space = VPX_CS_BT_601; cm->subsampling_y = cm->subsampling_x = 1; cm->bit_depth = VPX_BITS_8; #if CONFIG_VP9_HIGHBITDEPTH diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 0e3c1dba4..b1deec9f3 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1665,7 +1665,7 @@ static void write_bitdepth_colorspace_sampling( vp9_wb_write_bit(wb, cm->bit_depth == VPX_BITS_10 ? 0 : 1); } vp9_wb_write_literal(wb, cm->color_space, 3); - if (cm->color_space != SRGB) { + if (cm->color_space != VPX_CS_SRGB) { vp9_wb_write_bit(wb, 0); // 0: [16, 235] (i.e. xvYCC), 1: [0, 255] if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { assert(cm->subsampling_x != 1 || cm->subsampling_y != 1); diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index a148ffe9e..ce433ea76 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -1217,6 +1217,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { if (cm->profile != oxcf->profile) cm->profile = oxcf->profile; cm->bit_depth = oxcf->bit_depth; + cm->color_space = oxcf->color_space; if (cm->profile <= PROFILE_1) assert(cm->bit_depth == VPX_BITS_8); diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 9b585ad90..1b2a2ccbc 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -217,7 +217,7 @@ typedef struct VP9EncoderConfig { #if CONFIG_VP9_HIGHBITDEPTH int use_highbitdepth; #endif - COLOR_SPACE color_space; + vpx_color_space_t color_space; } VP9EncoderConfig; static INLINE int is_lossless_requested(const VP9EncoderConfig *cfg) { diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index a8ae8144e..c29ad81b4 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -38,8 +38,8 @@ struct vp9_extracfg { AQ_MODE aq_mode; unsigned int frame_periodic_boost; vpx_bit_depth_t bit_depth; - COLOR_SPACE color_space; vp9e_tune_content content; + vpx_color_space_t color_space; }; static struct vp9_extracfg default_extra_cfg = { @@ -60,8 +60,8 @@ static struct vp9_extracfg default_extra_cfg = { NO_AQ, // aq_mode 0, // frame_periodic_delta_q VPX_BITS_8, // Bit depth - UNKNOWN, // Color Space - VP9E_CONTENT_DEFAULT // content + VP9E_CONTENT_DEFAULT, // content + VPX_CS_UNKNOWN, // color space }; struct vpx_codec_alg_priv { @@ -290,7 +290,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, cfg->g_bit_depth == VPX_BITS_8) { ERROR("Codec bit-depth 8 not supported in profile > 1"); } - RANGE_CHECK(extra_cfg, color_space, UNKNOWN, SRGB); + RANGE_CHECK(extra_cfg, color_space, VPX_CS_UNKNOWN, VPX_CS_SRGB); return VPX_CODEC_OK; } @@ -1245,6 +1245,13 @@ static vpx_codec_err_t ctrl_set_tune_content(vpx_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } +static vpx_codec_err_t ctrl_set_color_space(vpx_codec_alg_priv_t *ctx, + va_list args) { + struct vp9_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.color_space = CAST(VP9E_SET_COLOR_SPACE, args); + return update_extra_cfg(ctx, &extra_cfg); +} + static vpx_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { {VP8_COPY_REFERENCE, ctrl_copy_reference}, {VP8E_UPD_ENTROPY, ctrl_update_entropy}, @@ -1277,6 +1284,7 @@ static vpx_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { {VP9E_SET_SVC_PARAMETERS, ctrl_set_svc_parameters}, {VP9E_SET_SVC_LAYER_ID, ctrl_set_svc_layer_id}, {VP9E_SET_TUNE_CONTENT, ctrl_set_tune_content}, + {VP9E_SET_COLOR_SPACE, ctrl_set_color_space}, {VP9E_SET_NOISE_SENSITIVITY, ctrl_set_noise_sensitivity}, // Getters diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index 77d9d6a1c..3e65ee54b 100644 --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@ -216,7 +216,22 @@ enum vp8e_enc_control_id { * temporal layer. */ VP9E_SET_SVC_LAYER_ID, - VP9E_SET_TUNE_CONTENT + VP9E_SET_TUNE_CONTENT, + VP9E_GET_SVC_LAYER_ID, + VP9E_REGISTER_CX_CALLBACK, + + /*!\brief control function to set color space info. + * \note Valid ranges: 0..7, default is "UNKNOWN". + * 0 = UNKNOWN, + * 1 = BT_601 + * 2 = BT_709 + * 3 = SMPTE_170 + * 4 = SMPTE_240 + * 5 = BT_2020 + * 6 = RESERVED + * 7 = SRGB + */ + VP9E_SET_COLOR_SPACE, }; /*!\brief vpx 1-D scaling mode @@ -372,6 +387,8 @@ VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PERIODIC_BOOST, unsigned int) VPX_CTRL_USE_TYPE(VP9E_SET_NOISE_SENSITIVITY, unsigned int) VPX_CTRL_USE_TYPE(VP9E_SET_TUNE_CONTENT, int) /* vp9e_tune_content */ + +VPX_CTRL_USE_TYPE(VP9E_SET_COLOR_SPACE, int) /*! @} - end defgroup vp8_encoder */ #ifdef __cplusplus } // extern "C" diff --git a/vpxenc.c b/vpxenc.c index 0a0c0718b..752b654bc 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -430,7 +430,7 @@ static const int vp9_arg_ctrl_map[] = { VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT, VP9E_SET_LOSSLESS, VP9E_SET_FRAME_PARALLEL_DECODING, VP9E_SET_AQ_MODE, VP9E_SET_FRAME_PERIODIC_BOOST, VP9E_SET_NOISE_SENSITIVITY, - VP9E_SET_TUNE_CONTENT, + VP9E_SET_TUNE_CONTENT, VP9E_SET_COLOR_SPACE, 0 }; #endif -- 2.49.0