From 0d5ebd416ed9ddc5291a6c2eeb745fa4758fa79b Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Thu, 15 Aug 2024 12:08:46 -0700
Subject: [PATCH] remove aom_convolve8() from rtcd
aom_convolve8_c() is a synonym for aom_scaled_2d_c() in aom_convolve.c;
there are no optimized versions of this function, just aom_scaled_2d().
Bug: aomedia:3416
Change-Id: I7088c24e778eeaca5e49f4f8fdae06e0c15d7fc4
---
aom_dsp/aom_convolve.c | 10 +---------
aom_dsp/aom_dsp_rtcd_defs.pl | 1 -
av1/common/resize.h | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/aom_dsp/aom_convolve.c b/aom_dsp/aom_convolve.c
index e139ba1fb8..99594de7f4 100644
--- a/aom_dsp/aom_convolve.c
+++ b/aom_dsp/aom_convolve.c
@@ -111,7 +111,7 @@ void aom_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride,
w, h);
}
-void aom_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
+void aom_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride, const InterpKernel *filter,
int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w,
int h) {
@@ -145,14 +145,6 @@ void aom_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
y0_q4, y_step_q4, w, h);
}
-void aom_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
- ptrdiff_t dst_stride, const InterpKernel *filter,
- int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w,
- int h) {
- aom_convolve8_c(src, src_stride, dst, dst_stride, filter, x0_q4, x_step_q4,
- y0_q4, y_step_q4, w, h);
-}
-
void aom_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride, int w, int h) {
for (int r = h; r > 0; --r) {
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index 1a68f1b7a6..ff6be37591 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -492,7 +492,6 @@ ()
#
# Sub Pixel Filters
#
-add_proto qw/void aom_convolve8/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h";
add_proto qw/void aom_convolve_copy/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, int w, int h";
add_proto qw/void aom_convolve8_horiz/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h";
add_proto qw/void aom_convolve8_vert/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h";
diff --git a/av1/common/resize.h b/av1/common/resize.h
index c8939bf786..489ad81f51 100644
--- a/av1/common/resize.h
+++ b/av1/common/resize.h
@@ -115,7 +115,7 @@ static inline int av1_superres_scaled(const AV1_COMMON *cm) {
}
// The optimized scaler av1_resize_and_extend_frame() can only handle scaling
-// ratios >= 1/4 and <= 16. See comment in aom_convolve8_c() for detail.
+// ratios >= 1/4 and <= 16. See comment in aom_scaled_2d_c() for detail.
// Visual assessment shows that if the scaling ratio or its reciprocal is not a
// multiple of 1/16, there are some artifacts in the output of the optimized
// scaler, especially on lines, due to non-exact ratio representation. SSSE3