From 648ff2d87703389885ff1067624da9490e3537af Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Tue, 13 Aug 2024 17:09:05 -0700
Subject: [PATCH] aq_cyclicrefresh.c: make av1_cyclic_refresh_reset_resize()
static
This function is unused outside of this file.
Bug: aomedia:3416
Change-Id: I06a865117dd472659652cd6316ef2c8fb6a9ebf4
---
av1/encoder/aq_cyclicrefresh.c | 28 ++++++++++++++--------------
av1/encoder/aq_cyclicrefresh.h | 2 --
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/av1/encoder/aq_cyclicrefresh.c b/av1/encoder/aq_cyclicrefresh.c
index e4d942a0f..5c087267c 100644
--- a/av1/encoder/aq_cyclicrefresh.c
+++ b/av1/encoder/aq_cyclicrefresh.c
@@ -540,6 +540,19 @@ void av1_cyclic_refresh_update_parameters(AV1_COMP *const cpi) {
}
}
+static void cyclic_refresh_reset_resize(AV1_COMP *const cpi) {
+ const AV1_COMMON *const cm = &cpi->common;
+ CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
+ memset(cr->map, 0, cm->mi_params.mi_rows * cm->mi_params.mi_cols);
+ cr->sb_index = 0;
+ cr->last_sb_index = 0;
+ cpi->refresh_frame.golden_frame = true;
+ cr->apply_cyclic_refresh = 0;
+ cr->counter_encode_maxq_scene_change = 0;
+ cr->percent_refresh_adjustment = 5;
+ cr->rate_ratio_qdelta_adjustment = 0.25;
+}
+
// Setup cyclic background refresh: set delta q and segmentation map.
void av1_cyclic_refresh_setup(AV1_COMP *const cpi) {
AV1_COMMON *const cm = &cpi->common;
@@ -560,7 +573,7 @@ void av1_cyclic_refresh_setup(AV1_COMP *const cpi) {
cm->height != cm->prev_frame->height) &&
cpi->svc.prev_number_spatial_layers == cpi->svc.number_spatial_layers;
- if (resolution_change) av1_cyclic_refresh_reset_resize(cpi);
+ if (resolution_change) cyclic_refresh_reset_resize(cpi);
if (!cr->apply_cyclic_refresh) {
// Don't disable and set seg_map to 0 if active_maps is enabled, unless
// whole frame is set as inactive (since we only apply cyclic_refresh to
@@ -653,19 +666,6 @@ int av1_cyclic_refresh_get_rdmult(const CYCLIC_REFRESH *cr) {
return cr->rdmult;
}
-void av1_cyclic_refresh_reset_resize(AV1_COMP *const cpi) {
- const AV1_COMMON *const cm = &cpi->common;
- CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
- memset(cr->map, 0, cm->mi_params.mi_rows * cm->mi_params.mi_cols);
- cr->sb_index = 0;
- cr->last_sb_index = 0;
- cpi->refresh_frame.golden_frame = true;
- cr->apply_cyclic_refresh = 0;
- cr->counter_encode_maxq_scene_change = 0;
- cr->percent_refresh_adjustment = 5;
- cr->rate_ratio_qdelta_adjustment = 0.25;
-}
-
int av1_cyclic_refresh_disable_lf_cdef(AV1_COMP *const cpi) {
CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
const int qindex = cpi->common.quant_params.base_qindex;
diff --git a/av1/encoder/aq_cyclicrefresh.h b/av1/encoder/aq_cyclicrefresh.h
index 245af6ccc..0613c4386 100644
--- a/av1/encoder/aq_cyclicrefresh.h
+++ b/av1/encoder/aq_cyclicrefresh.h
@@ -307,8 +307,6 @@ void av1_cyclic_refresh_setup(struct AV1_COMP *const cpi);
int av1_cyclic_refresh_get_rdmult(const CYCLIC_REFRESH *cr);
-void av1_cyclic_refresh_reset_resize(struct AV1_COMP *const cpi);
-
int av1_cyclic_refresh_disable_lf_cdef(struct AV1_COMP *const cpi);
static inline int cyclic_refresh_segment_id_boosted(int segment_id) {