Revert "rtc: golden update under cyclic refresh"
This reverts commit 02ab02e360b0d23b9e03873eaf18d84d7cb0b878.
Reason for revert: <INSERT REASONING HERE>
Found bug with this change (flags used in line 347 should be ext_refresh_golden_frame instead of refresh_golden_frame). With this fix there is small bdrate loss, so better to remove this logic for now. Will revisit later.
Change-Id: Icdd5178fd2e8d400ec0d9c08c0fb9c5f2f766c1b
diff --git a/av1/encoder/aq_cyclicrefresh.c b/av1/encoder/aq_cyclicrefresh.c
index 738a02a..49221a6 100644
--- a/av1/encoder/aq_cyclicrefresh.c
+++ b/av1/encoder/aq_cyclicrefresh.c
@@ -38,7 +38,6 @@
assert(MAXQ <= 255);
memset(cr->last_coded_q_map, MAXQ, last_coded_q_map_size);
cr->avg_frame_low_motion = 0.0;
- cr->gld_fixed_slot = 0;
return cr;
}
@@ -344,7 +343,6 @@
cr->apply_cyclic_refresh = 1;
if (frame_is_intra_only(cm) || is_lossless_requested(&cpi->oxcf) ||
cpi->svc.temporal_layer_id > 0 ||
- (cr->gld_fixed_slot && cpi->refresh_golden_frame) ||
rc->avg_frame_qindex[INTER_FRAME] < qp_thresh ||
(rc->frames_since_key > 20 &&
rc->avg_frame_qindex[INTER_FRAME] > qp_max_thresh) ||
diff --git a/av1/encoder/aq_cyclicrefresh.h b/av1/encoder/aq_cyclicrefresh.h
index 304c598..ee62f6a 100644
--- a/av1/encoder/aq_cyclicrefresh.h
+++ b/av1/encoder/aq_cyclicrefresh.h
@@ -67,7 +67,6 @@
int apply_cyclic_refresh;
int cnt_zeromv;
double avg_frame_low_motion;
- int gld_fixed_slot;
};
struct AV1_COMP;
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 7772c68..84d16e3 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1964,7 +1964,6 @@
cpi->ext_refresh_golden_frame = 1;
cpi->svc.refresh[gld_idx] = 1;
}
- cpi->cyclic_refresh->gld_fixed_slot = gld_fixed_slot;
}
#define DEFAULT_KF_BOOST_RT 2300
