From 7230cd840a6a7d168e047a101dd19b3ef05b490b Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Tue, 13 Aug 2024 18:36:15 -0700
Subject: [PATCH] move av1_fdwt8x8_uint8_input_c to rtcd
This looks like it was the intent given the name. The function was added
in:
2dbdbc9de1 Add wavelet energy based q modulation
Other functions in dwt.c may also warrant adding to rtcd given the 8x8
block size.
Bug: aomedia:3416
Change-Id: I215d360c28d8b9f964c7cd73e0115bd0f61f3193
---
av1/common/av1_rtcd_defs.pl | 1 +
av1/encoder/dwt.c | 2 +-
av1/encoder/dwt.h | 3 ---
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index 1963751fab..94a5171080 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -254,6 +254,7 @@ ()
# Encoder functions below this point.
#
if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
+ add_proto qw/void av1_fdwt8x8_uint8_input/, "const uint8_t *input, tran_low_t *output, int stride, int hbd";
# ENCODEMB INVOKE
add_proto qw/void aom_upsampled_pred/, "MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
diff --git a/av1/encoder/dwt.c b/av1/encoder/dwt.c
index 84b3b7515a..f7c1778d61 100644
--- a/av1/encoder/dwt.c
+++ b/av1/encoder/dwt.c
@@ -128,7 +128,7 @@ static int haar_ac_sad_8x8_uint8_input(const uint8_t *input, int stride,
int hbd) {
tran_low_t output[64];
- av1_fdwt8x8_uint8_input_c(input, output, stride, hbd);
+ av1_fdwt8x8_uint8_input(input, output, stride, hbd);
return haar_ac_sad(output, 8, 8, 8);
}
diff --git a/av1/encoder/dwt.h b/av1/encoder/dwt.h
index 8ba6c02889..0ebbfc61bf 100644
--- a/av1/encoder/dwt.h
+++ b/av1/encoder/dwt.h
@@ -17,9 +17,6 @@
#define DWT_MAX_LENGTH 64
-void av1_fdwt8x8_uint8_input_c(const uint8_t *input, tran_low_t *output,
- int stride, int hbd);
-
int64_t av1_haar_ac_sad_mxn_uint8_input(const uint8_t *input, int stride,
int hbd, int num_8x8_rows,
int num_8x8_cols);