diff options
| author | Marco Paniconi <marpan@google.com> | 2016-04-12 21:18:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-12 21:18:41 +0000 |
| commit | f81b0000f60ea6f513d1a13d2c23b0bdc9f9a5e6 (patch) | |
| tree | 49350aa5b1093c44eb70c91309c6611fa9dc85e5 /vp9/encoder/vp9_ratectrl.c | |
| parent | ff72cca8bb52c79d4d5416a1dbbe73d9f848798e (diff) | |
| parent | 3861b25be1ac3f7c137e6058f91f8f6c90f4d28e (diff) | |
| download | libvpx-f81b0000f60ea6f513d1a13d2c23b0bdc9f9a5e6.tar libvpx-f81b0000f60ea6f513d1a13d2c23b0bdc9f9a5e6.tar.gz libvpx-f81b0000f60ea6f513d1a13d2c23b0bdc9f9a5e6.tar.bz2 libvpx-f81b0000f60ea6f513d1a13d2c23b0bdc9f9a5e6.zip | |
Merge "vp9: Fix to active_best for GF/ARF in 1 pass vbr."
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 38711071f..aa508de5f 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -905,9 +905,12 @@ static int rc_pick_q_and_bounds_one_pass_vbr(const VP9_COMP *cpi, // Use the lower of active_worst_quality and recent // average Q as basis for GF/ARF best Q limit unless last frame was // a key frame. - if (rc->frames_since_key > 1 && - rc->avg_frame_qindex[INTER_FRAME] < active_worst_quality) { - q = rc->avg_frame_qindex[INTER_FRAME]; + if (rc->frames_since_key > 1) { + if (rc->avg_frame_qindex[INTER_FRAME] < active_worst_quality) { + q = rc->avg_frame_qindex[INTER_FRAME]; + } else { + q = active_worst_quality; + } } else { q = rc->avg_frame_qindex[KEY_FRAME]; } |