ref: f83f9dbb3ad7129b7bd4768b5a610d28e32f4273
parent: 8be1dcb4cbbab433f63ac3516616cb748e2e626a
parent: 7ae1aa6b374aa86d70638e38b0fe6abdbb832475
author: Marco <[email protected]>
date: Thu Jul 16 15:38:26 EDT 2015
Merge "Dynamic resize for 1 pass: update of golden frame."
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -347,7 +347,10 @@
// For video conference clips, if the background has high motion in current
// frame because of the camera movement, set this frame as the golden frame.
// Use 70% and 5% as the thresholds for golden frame refreshing.
- if (cnt1 * 10 > (70 * rows * cols) && cnt2 * 20 < cnt1) {
+ // Also, force this frame as a golden update frame if this frame will change
+ // the resolution (resize_pending != 0).
+ if (cpi->resize_pending != 0 ||
+ (cnt1 * 10 > (70 * rows * cols) && cnt2 * 20 < cnt1)) {
vp9_cyclic_refresh_set_golden_update(cpi);
rc->frames_till_gf_update_due = rc->baseline_gf_interval;
@@ -562,4 +565,5 @@
CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
memset(cr->map, 0, cm->mi_rows * cm->mi_cols);
cr->sb_index = 0;
+ cpi->refresh_golden_frame = 1;
}