From 85e60d75554894964825f5718d14591294ec4e88 Mon Sep 17 00:00:00 2001
From: sunyuechi <[email protected]>
Date: Tue, 28 Nov 2023 14:08:12 +0800
Subject: [PATCH 1/2] checkasm: test for abs_pow34
---
libavcodec/aacenc.c | 24 +++++++------
libavcodec/aacenc.h | 1 +
tests/checkasm/Makefile | 1 +
tests/checkasm/aacencdsp.c | 70 ++++++++++++++++++++++++++++++++++++++
tests/checkasm/checkasm.c | 3 ++
tests/checkasm/checkasm.h | 1 +
tests/fate/checkasm.mak | 3 +-
7 files changed, 92 insertions(+), 11 deletions(-)
create mode 100644 tests/checkasm/aacencdsp.c
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 5e6a255a8f..443b25e25a 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -1381,16 +1381,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON);
s->random_state = 0x1f2e3d4c;
- s->abs_pow34 = abs_pow34_v;
- s->quant_bands = quantize_bands;
-
-#if ARCH_X86
- ff_aac_dsp_init_x86(s);
-#endif
-
-#if HAVE_MIPSDSP
- ff_aac_coder_init_mips(s);
-#endif
+ ff_aac_dsp_init(s);
ff_af_queue_init(avctx, &s->afq);
@@ -1444,3 +1435,16 @@ const FFCodec ff_aac_encoder = {
AV_SAMPLE_FMT_NONE },
.p.priv_class = &aacenc_class,
};
+
+void ff_aac_dsp_init(AACEncContext *s){
+ s->abs_pow34 = abs_pow34_v;
+ s->quant_bands = quantize_bands;
+
+#if ARCH_X86
+ ff_aac_dsp_init_x86(s);
+#endif
+
+#if HAVE_MIPSDSP
+ ff_aac_coder_init_mips(s);
+#endif
+}
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index b030c652ae..09dd8639be 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -154,6 +154,7 @@ typedef struct AACEncContext {
} buffer;
} AACEncContext;
+void ff_aac_dsp_init(AACEncContext *s);
void ff_aac_dsp_init_x86(AACEncContext *s);
void ff_aac_coder_init_mips(AACEncContext *c);
void ff_quantize_band_cost_cache_init(struct AACEncContext *s);
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 8bc241d29b..da209dd7ad 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -22,6 +22,7 @@ AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o
# decoders/encoders
AVCODECOBJS-$(CONFIG_AAC_DECODER) += aacpsdsp.o \
sbrdsp.o
+AVCODECOBJS-$(CONFIG_AAC_ENCODER) += aacencdsp.o
AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o
AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o
AVCODECOBJS-$(CONFIG_EXR_DECODER) += exrdsp.o
diff --git a/tests/checkasm/aacencdsp.c b/tests/checkasm/aacencdsp.c
new file mode 100644
index 0000000000..684c775862
--- /dev/null
+++ b/tests/checkasm/aacencdsp.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <string.h>
+
+#include "libavutil/mem.h"
+#include "libavutil/mem_internal.h"
+
+#include "libavcodec/aacenc.h"
+
+#include "checkasm.h"
+
+#define randomize_float(buf, len) \
+ do { \
+ int i; \
+ for (i = 0; i < len; i++) { \
+ float f = (float)rnd() / (UINT_MAX >> 5) - 16.0f; \
+ buf[i] = f; \
+ } \
+ } while (0)
+
+static void test_abs_pow34(AACEncContext *s) {
+#define BUF_SIZE 1024
+ LOCAL_ALIGNED_32(float, in, [BUF_SIZE]);
+
+ declare_func(void, float *, const float *, int);
+
+ randomize_float(in, BUF_SIZE);
+
+ if (check_func(s->abs_pow34, "abs_pow34")) {
+ LOCAL_ALIGNED_32(float, out, [BUF_SIZE]);
+ LOCAL_ALIGNED_32(float, out2, [BUF_SIZE]);
+
+ call_ref(out, in, BUF_SIZE);
+ call_new(out2, in, BUF_SIZE);
+
+ if (memcmp(out, out2, BUF_SIZE * sizeof(float)) != 0)
+ fail();
+
+ bench_new(out, in, BUF_SIZE);
+ }
+
+ report("abs_pow34");
+}
+
+
+void checkasm_check_aacencdsp(void)
+{
+ AACEncContext s = { 0 };
+ ff_aac_dsp_init(&s);
+
+ test_abs_pow34(&s);
+}
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index a15e801caf..a8d17ba740 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -77,6 +77,9 @@ static const struct {
{ "aacpsdsp", checkasm_check_aacpsdsp },
{ "sbrdsp", checkasm_check_sbrdsp },
#endif
+ #if CONFIG_AAC_ENCODER
+ { "aacencdsp", checkasm_check_aacencdsp },
+ #endif
#if CONFIG_ALAC_DECODER
{ "alacdsp", checkasm_check_alacdsp },
#endif
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 41093f2dca..df4dc5272e 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -43,6 +43,7 @@
#include "libavutil/lfg.h"
#include "libavutil/timer.h"
+void checkasm_check_aacencdsp(void);
void checkasm_check_aacpsdsp(void);
void checkasm_check_afir(void);
void checkasm_check_alacdsp(void);
diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index 57b0dff4f2..f23151aa6e 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -1,4 +1,5 @@
-FATE_CHECKASM = fate-checkasm-aacpsdsp \
+FATE_CHECKASM = fate-checkasm-aacencdsp \
+ fate-checkasm-aacpsdsp \
fate-checkasm-af_afir \
fate-checkasm-alacdsp \
fate-checkasm-audiodsp \
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
