Merge "vp8: enc: Fix valid range for under/over_shoot pct"

James Zern committed 5 years ago

Commit 55643372 parents 9f57bc4 adc185f2 files · +4 −4Browse files

Unified · Split

2 files

vp8/vp8_cx_iface.c +2 −2
vpx/vpx_encoder.h +2 −2

vp8/vp8_cx_iface.c+2−2

@@ -152,8 +152,8 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, · 151 unmodified lines
152	RANGE_CHECK_HI(cfg, g_lag_in_frames, 25);	152	RANGE_CHECK_HI(cfg, g_lag_in_frames, 25);
153	#endif	153	#endif
154	RANGE_CHECK(cfg, rc_end_usage, VPX_VBR, VPX_Q);	154	RANGE_CHECK(cfg, rc_end_usage, VPX_VBR, VPX_Q);
155	RANGE_CHECK_HI(cfg, rc_undershoot_pct, 1000);	155	RANGE_CHECK_HI(cfg, rc_undershoot_pct, 100);
156	RANGE_CHECK_HI(cfg, rc_overshoot_pct, 1000);	156	RANGE_CHECK_HI(cfg, rc_overshoot_pct, 100);
157	RANGE_CHECK_HI(cfg, rc_2pass_vbr_bias_pct, 100);	157	RANGE_CHECK_HI(cfg, rc_2pass_vbr_bias_pct, 100);
158	RANGE_CHECK(cfg, kf_mode, VPX_KF_DISABLED, VPX_KF_AUTO);	158	RANGE_CHECK(cfg, kf_mode, VPX_KF_DISABLED, VPX_KF_AUTO);
159		159

vpx/vpx_encoder.h+2−2

@@ -498,7 +498,7 @@ typedef struct vpx_codec_enc_cfg { · 497 unmodified lines
498	* undershoot level (current rate vs target) beyond which more aggressive	498	* undershoot level (current rate vs target) beyond which more aggressive
499	* corrective measures are taken.	499	* corrective measures are taken.
500	* *	500	* *
501	* Valid values in the range VP8:0-1000 VP9: 0-100.	501	* Valid values in the range VP8:0-100 VP9: 0-100.
502	*/	502	*/
503	unsigned int rc_undershoot_pct;	503	unsigned int rc_undershoot_pct;
504		504
@@ -513,7 +513,7 @@ typedef struct vpx_codec_enc_cfg { · 8 unmodified lines
513	* overshoot level (current rate vs target) beyond which more aggressive	513	* overshoot level (current rate vs target) beyond which more aggressive
514	* corrective measures are taken.	514	* corrective measures are taken.
515	*	515	*
516	* Valid values in the range VP8:0-1000 VP9: 0-100.	516	* Valid values in the range VP8:0-100 VP9: 0-100.
517	*/	517	*/
518	unsigned int rc_overshoot_pct;	518	unsigned int rc_overshoot_pct;
519		519