diff options
| author | Debargha Mukherjee <debargha@google.com> | 2015-04-08 10:48:17 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-04-08 10:48:17 -0700 |
| commit | 59681be0a04a275daf5345274b61cebb6000f594 (patch) | |
| tree | fbcb32d14a25f9aaecbf7340faac91ea1f6159c9 /vp9/encoder | |
| parent | 2ed0cf06f9984a6c1ae2762c9fa0b5347027fbc6 (diff) | |
| parent | 60bd744c8800423fe28deb65d9129030f2928332 (diff) | |
| download | libvpx-59681be0a04a275daf5345274b61cebb6000f594.tar libvpx-59681be0a04a275daf5345274b61cebb6000f594.tar.gz libvpx-59681be0a04a275daf5345274b61cebb6000f594.tar.bz2 libvpx-59681be0a04a275daf5345274b61cebb6000f594.zip | |
Merge "Improve accuracy of rate control in CQ mode"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 380f0b78a..bf9e50047 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2612,6 +2612,7 @@ void vp9_rc_get_second_pass_params(VP9_COMP *cpi) { } #define MINQ_ADJ_LIMIT 48 +#define MINQ_ADJ_LIMIT_CQ 20 void vp9_twopass_postencode_update(VP9_COMP *cpi) { TWO_PASS *const twopass = &cpi->twopass; RATE_CONTROL *const rc = &cpi->rc; @@ -2651,7 +2652,7 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) { const int maxq_adj_limit = rc->worst_quality - twopass->active_worst_quality; const int minq_adj_limit = - (cpi->oxcf.rc_mode == VPX_CQ) ? 0 : MINQ_ADJ_LIMIT; + (cpi->oxcf.rc_mode == VPX_CQ ? MINQ_ADJ_LIMIT_CQ : MINQ_ADJ_LIMIT); // Undershoot. if (rc->rate_error_estimate > cpi->oxcf.under_shoot_pct) { |