dwt: remove av1_dct_ac_sad & av1_variance
these two functions have been unused since their introduction in:
2dbdbc9de1 Add wavelet energy based q modulation
+ make av1_haar_ac_sad static
Bug: aomedia:3416
Change-Id: Ifbfc6f90c0a1a8501b1996ce4337f0e641c5d247
diff --git a/av1/encoder/dwt.c b/av1/encoder/dwt.c
index 5dfbcb6..2fab99d 100644
--- a/av1/encoder/dwt.c
+++ b/av1/encoder/dwt.c
@@ -114,7 +114,7 @@
dyadic_analyze_53_uint8_input(4, 8, 8, input, stride, output, 8, 2, hbd);
}
-int av1_haar_ac_sad(const tran_low_t *output, int bw, int bh, int stride) {
+static int haar_ac_sad(const tran_low_t *output, int bw, int bh, int stride) {
int acsad = 0;
for (int r = 0; r < bh; ++r)
@@ -124,35 +124,12 @@
return acsad;
}
-uint64_t av1_dct_ac_sad(tran_low_t *output, int bw, int bh, int stride) {
- uint64_t acsad = 0;
-
- for (int r = 0; r < bh; ++r)
- for (int c = 0; c < bw; ++c) {
- if (r > 0 || c > 0) acsad += abs(output[r * stride + c]);
- }
-
- return acsad;
-}
-
-uint32_t av1_variance(uint8_t *input, int bw, int bh, int stride) {
- int sum = 0;
- uint32_t sse = 0;
-
- for (int r = 0; r < bh; ++r)
- for (int c = 0; c < bw; ++c) {
- sum += input[r * stride + c];
- sse += input[r * stride + c] * input[r * stride + c];
- }
- return sse - (uint32_t)(((int64_t)sum * sum) / (bw * bh));
-}
-
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);
- return av1_haar_ac_sad(output, 8, 8, 8);
+ return haar_ac_sad(output, 8, 8, 8);
}
int64_t av1_haar_ac_sad_mxn_uint8_input(const uint8_t *input, int stride,
