From edd540129f0938c5517b19ae5122b37986534d4b Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Mon, 19 Aug 2024 15:29:41 -0700
Subject: [PATCH] reconinter.c: make av1_modify_neighbor_predictor_for_obmc
static
This function is unused outside of this file.
Bug: aomedia:3416
Change-Id: I441ec77ce91b23a1e0c3f3e4e24d2c0bd37ff158
---
av1/common/reconinter.c | 6 +++---
av1/common/reconinter.h | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index ec43becc3..eec2343b0 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -832,7 +832,7 @@ int av1_skip_u4x4_pred_in_obmc(BLOCK_SIZE bsize,
}
}
-void av1_modify_neighbor_predictor_for_obmc(MB_MODE_INFO *mbmi) {
+static void modify_neighbor_predictor_for_obmc(MB_MODE_INFO *mbmi) {
mbmi->ref_frame[1] = NONE_FRAME;
mbmi->interinter_comp.type = COMPOUND_AVERAGE;
}
@@ -976,7 +976,7 @@ void av1_setup_build_prediction_by_above_pred(
const BLOCK_SIZE a_bsize = AOMMAX(BLOCK_8X8, above_mbmi->bsize);
const int above_mi_col = xd->mi_col + rel_mi_col;
- av1_modify_neighbor_predictor_for_obmc(above_mbmi);
+ modify_neighbor_predictor_for_obmc(above_mbmi);
for (int j = 0; j < num_planes; ++j) {
struct macroblockd_plane *const pd = &xd->plane[j];
@@ -1015,7 +1015,7 @@ void av1_setup_build_prediction_by_left_pred(MACROBLOCKD *xd, int rel_mi_row,
const BLOCK_SIZE l_bsize = AOMMAX(BLOCK_8X8, left_mbmi->bsize);
const int left_mi_row = xd->mi_row + rel_mi_row;
- av1_modify_neighbor_predictor_for_obmc(left_mbmi);
+ modify_neighbor_predictor_for_obmc(left_mbmi);
for (int j = 0; j < num_planes; ++j) {
struct macroblockd_plane *const pd = &xd->plane[j];
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index ed06ee0bb..0a33c9348 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -293,7 +293,6 @@ static inline void highbd_inter_predictor(
}
}
-void av1_modify_neighbor_predictor_for_obmc(MB_MODE_INFO *mbmi);
int av1_skip_u4x4_pred_in_obmc(BLOCK_SIZE bsize,
const struct macroblockd_plane *pd, int dir);