From: John Koleszar Date: Mon, 25 Apr 2011 17:49:32 +0000 (-0700) Subject: Merge "Change rc undershoot/overshoot semantics" X-Git-Tag: v0.9.7~195 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfbfd39de8da61644ff0fd3a149d3a8957c28b1d;p=libvpx Merge "Change rc undershoot/overshoot semantics" --- cfbfd39de8da61644ff0fd3a149d3a8957c28b1d diff --cc vp8/encoder/ratectrl.c index 2c1051f1a,767b27176..8e8854ab7 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@@ -1538,7 -1538,6 +1537,7 @@@ void vp8_adjust_key_frame_context(VP8_C cpi->key_frame_count++; } - ++void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit) void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit) { // Set-up bounds on acceptable frame size: diff --cc vp8/vp8_cx_iface.c index 17eb6a2ce,6b13033d0..db60bfe4f --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@@ -1084,11 -1090,11 +1086,11 @@@ static vpx_codec_enc_cfg_map_t vp8e_usa {0}, /* rc_twopass_stats_in */ #endif 256, /* rc_target_bandwidth */ - + 0, /* rc_max_intra_bitrate_pct */ 4, /* rc_min_quantizer */ 63, /* rc_max_quantizer */ - 95, /* rc_undershoot_pct */ - 200, /* rc_overshoot_pct */ + 100, /* rc_undershoot_pct */ + 100, /* rc_overshoot_pct */ 6000, /* rc_max_buffer_size */ 4000, /* rc_buffer_initial_size; */