ref: cff15f9d3cb014658516fbdafd3fe9c21fb27213
parent: 1a0a10cf3db6b8ef59bb60fb3214342b78177699
parent: d6bbda4bc20db9091aa5d17589cfc2676c63a632
author: Marco Paniconi <[email protected]>
date: Thu Oct 15 17:09:06 EDT 2015
Merge "Fix resetting of cyclic refresh on dynamic resize change."
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -571,6 +571,10 @@
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);
}
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1905,9 +1905,6 @@
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) ?