diff options
| author | Marco Paniconi <marpan@google.com> | 2015-10-15 21:09:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-15 21:09:06 +0000 |
| commit | cff15f9d3cb014658516fbdafd3fe9c21fb27213 (patch) | |
| tree | b07457bc7272d89471678f716ec1ee599d2b5910 /vp9 | |
| parent | 1a0a10cf3db6b8ef59bb60fb3214342b78177699 (diff) | |
| parent | d6bbda4bc20db9091aa5d17589cfc2676c63a632 (diff) | |
| download | libvpx-cff15f9d3cb014658516fbdafd3fe9c21fb27213.tar libvpx-cff15f9d3cb014658516fbdafd3fe9c21fb27213.tar.gz libvpx-cff15f9d3cb014658516fbdafd3fe9c21fb27213.tar.bz2 libvpx-cff15f9d3cb014658516fbdafd3fe9c21fb27213.zip | |
Merge "Fix resetting of cyclic refresh on dynamic resize change."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_aq_cyclicrefresh.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c index 04fa8f6fd..e4b76dbc6 100644 --- a/vp9/encoder/vp9_aq_cyclicrefresh.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -571,6 +571,10 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) { cr->qindex_delta[2] = qindex_delta; vp9_set_segdata(seg, CR_SEGMENT_ID_BOOST2, SEG_LVL_ALT_Q, qindex_delta); + // Reset if resoluton change has occurred. + if (cpi->resize_pending != 0) + vp9_cyclic_refresh_reset_resize(cpi); + // Update the segmentation and refresh map. cyclic_refresh_update_map(cpi); } diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 0d5557399..be45464ee 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1905,9 +1905,6 @@ int vp9_resize_one_pass_cbr(VP9_COMP *cpi) { rc->buffer_level = rc->optimal_buffer_level; rc->bits_off_target = rc->optimal_buffer_level; rc->this_frame_target = calc_pframe_target_size_one_pass_cbr(cpi); - // Reset cyclic refresh parameters. - if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled) - vp9_cyclic_refresh_reset_resize(cpi); // Get the projected qindex, based on the scaled target frame size (scaled // so target_bits_per_mb in vp9_rc_regulate_q will be correct target). target_bits_per_frame = (resize_action >= 0) ? |