From 416529069b647085d4d3f75ca9239ba14c881e2c Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 12 Mar 2015 17:59:18 -0700 Subject: [PATCH] Rename a vp9 only control with vp9e prefix Also updated comments and doc to make it clear that the control is supported in VP9 only. Change-Id: I6f120b65135fc1185695e9e3dc29fbe0d430824b --- vp9/vp9_cx_iface.c | 4 ++-- vpx/vp8cx.h | 11 ++++++----- vpxenc.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index d1dd66b2c..fb6aac721 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -694,7 +694,7 @@ static vpx_codec_err_t ctrl_set_rc_gf_cbr_boost_pct( vpx_codec_alg_priv_t *ctx, va_list args) { struct vp9_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.gf_cbr_boost_pct = - CAST(VP8E_SET_GF_CBR_BOOST_PCT, args); + CAST(VP9E_SET_GF_CBR_BOOST_PCT, args); return update_extra_cfg(ctx, &extra_cfg); } @@ -1387,7 +1387,7 @@ static vpx_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { {VP8E_SET_CQ_LEVEL, ctrl_set_cq_level}, {VP8E_SET_MAX_INTRA_BITRATE_PCT, ctrl_set_rc_max_intra_bitrate_pct}, {VP8E_SET_MAX_INTER_BITRATE_PCT, ctrl_set_rc_max_inter_bitrate_pct}, - {VP8E_SET_GF_CBR_BOOST_PCT, ctrl_set_rc_gf_cbr_boost_pct}, + {VP9E_SET_GF_CBR_BOOST_PCT, ctrl_set_rc_gf_cbr_boost_pct}, {VP9E_SET_LOSSLESS, ctrl_set_lossless}, {VP9E_SET_FRAME_PARALLEL_DECODING, ctrl_set_frame_parallel_decoding_mode}, {VP9E_SET_AQ_MODE, ctrl_set_aq_mode}, diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index a920ee3f9..586f08b08 100644 --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@ -124,9 +124,9 @@ extern vpx_codec_iface_t *vpx_codec_vp9_cx(void); #define VP8_EFLAG_NO_UPD_ENTROPY (1<<20) -/*!\brief VP8 encoder control functions +/*!\brief VPx encoder control functions * - * This set of macros define the control functions available for the VP8 + * This set of macros define the control functions available for VPx * encoder interface. * * \sa #vpx_codec_control @@ -223,8 +223,9 @@ enum vp8e_enc_control_id { * For example, to allow 100% more bits, i.e, 2X, in a golden frame * than average frame, set this to 100. * + * Supported in codecs: VP9 */ - VP8E_SET_GF_CBR_BOOST_PCT, + VP9E_SET_GF_CBR_BOOST_PCT, /*!\brief Codec control function to set the temporal layer id * @@ -531,10 +532,10 @@ VPX_CTRL_USE_TYPE(VP9E_GET_SVC_LAYER_ID, vpx_svc_layer_id_t *) VPX_CTRL_USE_TYPE(VP8E_SET_MAX_INTRA_BITRATE_PCT, unsigned int) VPX_CTRL_USE_TYPE(VP8E_SET_MAX_INTER_BITRATE_PCT, unsigned int) -VPX_CTRL_USE_TYPE(VP8E_SET_GF_CBR_BOOST_PCT, unsigned int) - VPX_CTRL_USE_TYPE(VP8E_SET_SCREEN_CONTENT_MODE, unsigned int) +VPX_CTRL_USE_TYPE(VP9E_SET_GF_CBR_BOOST_PCT, unsigned int) + VPX_CTRL_USE_TYPE(VP9E_SET_LOSSLESS, unsigned int) VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PARALLEL_DECODING, unsigned int) diff --git a/vpxenc.c b/vpxenc.c index 8b57dd0f0..ad504b15a 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -457,7 +457,7 @@ static const int vp9_arg_ctrl_map[] = { VP9E_SET_TILE_COLUMNS, VP9E_SET_TILE_ROWS, VP8E_SET_ARNR_MAXFRAMES, VP8E_SET_ARNR_STRENGTH, VP8E_SET_ARNR_TYPE, VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT, - VP8E_SET_MAX_INTER_BITRATE_PCT, VP8E_SET_GF_CBR_BOOST_PCT, + VP8E_SET_MAX_INTER_BITRATE_PCT, VP9E_SET_GF_CBR_BOOST_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_COLOR_SPACE, -- 2.40.0