Hi there,
Here is a patch that changes the avfft test. This test is similar to
libavcodec/tests/fft-fixed.c. I modified libavcodec/tests/fft.c a bit to adapt
to make use of the new abi. At the moment I only did test for fft and mdct, If
no more suggestions then I'll do tests for the remaining modules.
Any suggestion is welcome :)
Thanks,
Petru Rares.
From b77fa779cf961ddb4bbe89152ec2712b80979a02 Mon Sep 17 00:00:00 2001
From: Petru Rares Sincraian <psincra...@outlook.com>
Date: Mon, 4 Jul 2016 17:23:14 +0200
Subject: [PATCH] fate: add test for avfft
---
libavcodec/tests/avfft.c | 41 +++--------------
libavcodec/tests/fft.c | 113 +++++++++++++++++++++++++++++++++++++++++------
tests/fate/fft.mak | 33 +++++++++++++-
3 files changed, 138 insertions(+), 49 deletions(-)
diff --git a/libavcodec/tests/avfft.c b/libavcodec/tests/avfft.c
index 6bc48ea..6660b15 100644
--- a/libavcodec/tests/avfft.c
+++ b/libavcodec/tests/avfft.c
@@ -16,38 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
-#include "libavutil/mem.h"
-#include "libavcodec/avfft.h"
-
-int main(int argc, char **argv)
-{
- int i;
-#define LEN 1024
- FFTSample *ref = av_malloc_array(LEN, sizeof(*ref));
- FFTSample *data = av_malloc_array(LEN, sizeof(*data));
- RDFTContext *rdft_context = av_rdft_init(10, DFT_R2C);
- RDFTContext *irdft_context = av_rdft_init(10, IDFT_C2R);
-
- if (!ref || !data || !rdft_context || !irdft_context)
- return 2;
- for (i=0; i<LEN; i++) {
- ref[i] = data[i] = i*456 + 123 + i*i;
- }
- av_rdft_calc(rdft_context, data);
- av_rdft_calc(irdft_context, data);
-
- for (i=0; i<LEN; i++) {
- if (fabs(ref[i] - data[i]/LEN*2) > 1) {
- fprintf(stderr, "Failed at %d (%f %f)\n", i, ref[i], data[i]/LEN*2);
- return 1;
- }
- }
-
- av_rdft_end(rdft_context);
- av_rdft_end(irdft_context);
- av_free(data);
- av_free(ref);
+/*
+ * This test is similar to fft-fixed.c or fft-fixed32.c
+ */
- return 0;
-}
+#define AVFFT 1
+#define FFT_FLOAT 0
+#define FFT_FIXED_32 0
+#include "fft.c"
diff --git a/libavcodec/tests/fft.c b/libavcodec/tests/fft.c
index 4717303..afd8ecb 100644
--- a/libavcodec/tests/fft.c
+++ b/libavcodec/tests/fft.c
@@ -39,7 +39,12 @@
#include "libavutil/mathematics.h"
#include "libavutil/time.h"
+#if AVFFT
+#include "libavcodec/avfft.h"
+#else
#include "libavcodec/fft.h"
+#endif
+
#if FFT_FLOAT
#include "libavcodec/dct.h"
#include "libavcodec/rdft.h"
@@ -55,7 +60,7 @@
pim += (MUL16(are, bim) + MUL16(bre, aim)); \
}
-#if FFT_FLOAT
+#if FFT_FLOAT || AVFFT
#define RANGE 1.0
#define REF_SCALE(x, bits) (x)
#define FMT "%10.6f"
@@ -211,6 +216,78 @@ static int check_diff(FFTSample *tab1, FFTSample *tab2, int n, double scale)
return err;
}
+static inline void fft_init(FFTContext **s, int nbits, int inverse)
+{
+#if AVFFT
+ *s = av_fft_init(nbits, inverse);
+#else
+ ff_fft_init(*s, nbits, inverse);
+#endif
+}
+
+static inline void mdct_init(FFTContext **s, int nbits, int inverse, double scale)
+{
+#if AVFFT
+ *s = av_mdct_init(nbits, inverse, scale);
+#else
+ ff_mdct_init(*s, nbits, inverse, scale);
+#endif
+}
+
+static inline void mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input)
+{
+#if AVFFT
+ av_mdct_calc(s, output, input);
+#else
+ s->mdct_calc(s, output, input);
+#endif
+}
+
+static inline void imdct_calc(struct FFTContext *s, FFTSample *output, const FFTSample *input)
+{
+#if AVFFT
+ av_imdct_calc(s, output, input);
+#else
+ s->imdct_calc(s, output, input);
+#endif
+}
+
+static inline void fft_permute(FFTContext *s, FFTComplex *z)
+{
+#if AVFFT
+ av_fft_permute(s, z);
+#else
+ s->fft_permute(s, z);
+#endif
+}
+
+static inline void fft_calc(FFTContext *s, FFTComplex *z)
+{
+#if AVFFT
+ av_fft_calc(s, z);
+#else
+ s->fft_calc(s, z);
+#endif
+}
+
+static inline void mdct_end(FFTContext *s)
+{
+#if AVFFT
+ av_mdct_end(s);
+#else
+ ff_mdct_end(s);
+#endif
+}
+
+static inline void fft_end(FFTContext *s)
+{
+#if AVFFT
+ av_fft_end(s);
+#else
+ ff_fft_end(s);
+#endif
+}
+
static void help(void)
{
av_log(NULL, AV_LOG_INFO,
@@ -241,7 +318,7 @@ int main(int argc, char **argv)
FFTComplex *tab, *tab1, *tab_ref;
FFTSample *tab2;
enum tf_transform transform = TRANSFORM_FFT;
- FFTContext m, s;
+ FFTContext *m, *s;
#if FFT_FLOAT
RDFTContext r;
DCTContext d;
@@ -252,6 +329,11 @@ int main(int argc, char **argv)
double scale = 1.0;
AVLFG prng;
+#if !AVFFT
+ s = av_mallocz(sizeof(*s));
+ m = av_mallocz(sizeof(*m));
+#endif
+
av_lfg_init(&prng, 1);
for (;;) {
@@ -313,7 +395,7 @@ int main(int argc, char **argv)
av_log(NULL, AV_LOG_INFO, "IMDCT");
else
av_log(NULL, AV_LOG_INFO, "MDCT");
- ff_mdct_init(&m, fft_nbits, do_inverse, scale);
+ mdct_init(&m, fft_nbits, do_inverse, scale);
break;
#endif /* CONFIG_MDCT */
case TRANSFORM_FFT:
@@ -321,7 +403,7 @@ int main(int argc, char **argv)
av_log(NULL, AV_LOG_INFO, "IFFT");
else
av_log(NULL, AV_LOG_INFO, "FFT");
- ff_fft_init(&s, fft_nbits, do_inverse);
+ fft_init(&s, fft_nbits, do_inverse);
if ((err = fft_ref_init(fft_nbits, do_inverse)) < 0)
goto cleanup;
break;
@@ -368,19 +450,19 @@ int main(int argc, char **argv)
case TRANSFORM_MDCT:
if (do_inverse) {
imdct_ref(&tab_ref->re, &tab1->re, fft_nbits);
- m.imdct_calc(&m, tab2, &tab1->re);
+ imdct_calc(m, tab2, &tab1->re);
err = check_diff(&tab_ref->re, tab2, fft_size, scale);
} else {
mdct_ref(&tab_ref->re, &tab1->re, fft_nbits);
- m.mdct_calc(&m, tab2, &tab1->re);
+ mdct_calc(m, tab2, &tab1->re);
err = check_diff(&tab_ref->re, tab2, fft_size / 2, scale);
}
break;
#endif /* CONFIG_MDCT */
case TRANSFORM_FFT:
memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
- s.fft_permute(&s, tab);
- s.fft_calc(&s, tab);
+ fft_permute(s, tab);
+ fft_calc(s, tab);
fft_ref(tab_ref, tab1, fft_nbits);
err = check_diff(&tab_ref->re, &tab->re, fft_size * 2, 1.0);
@@ -450,13 +532,13 @@ int main(int argc, char **argv)
switch (transform) {
case TRANSFORM_MDCT:
if (do_inverse)
- m.imdct_calc(&m, &tab->re, &tab1->re);
+ imdct_calc(m, &tab->re, &tab1->re);
else
- m.mdct_calc(&m, &tab->re, &tab1->re);
+ mdct_calc(m, &tab->re, &tab1->re);
break;
case TRANSFORM_FFT:
memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
- s.fft_calc(&s, tab);
+ fft_calc(s, tab);
break;
#if FFT_FLOAT
case TRANSFORM_RDFT:
@@ -485,11 +567,11 @@ int main(int argc, char **argv)
switch (transform) {
#if CONFIG_MDCT
case TRANSFORM_MDCT:
- ff_mdct_end(&m);
+ mdct_end(m);
break;
#endif /* CONFIG_MDCT */
case TRANSFORM_FFT:
- ff_fft_end(&s);
+ fft_end(s);
break;
#if FFT_FLOAT
# if CONFIG_RDFT
@@ -512,6 +594,11 @@ cleanup:
av_free(tab_ref);
av_free(exptab);
+#if !AVFFT
+ av_free(s);
+ av_free(m);
+#endif
+
if (err)
printf("Error: %d.\n", err);
diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak
index f42dded..6ca430d 100644
--- a/tests/fate/fft.mak
+++ b/tests/fate/fft.mak
@@ -65,10 +65,39 @@ $(FATE_FFT_FIXED32): libavcodec/tests/fft-fixed32$(EXESUF)
$(FATE_FFT_FIXED32): CMD = run libavcodec/tests/fft-fixed32 $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_FIXED32): REF = /dev/null
+define DEF_AV_FFT
+FATE_AV_DCT-$(CONFIG_DCT) += fate-av-dct1d-$(1) fate-av-idct1d-$(1)
+FATE_AV_FFT-$(CONFIG_FFT) += fate-av-fft-$(1) fate-av-ifft-$(1)
+FATE_AV_MDCT-$(CONFIG_MDCT) += fate-av-mdct-$(1) fate-av-imdct-$(1)
+FATE_AV_RDFT-$(CONFIG_RDFT) += fate-av-rdft-$(1) fate-av-irdft-$(1)
+
+fate-av-fft-$(N): ARGS = -n$(1)
+fate-av-ifft-$(N): ARGS = -n$(1) -i
+fate-av-mdct-$(N): ARGS = -n$(1) -m
+fate-av-imdct-$(N): ARGS = -n$(1) -m -i
+fate-av-rdft-$(N): ARGS = -n$(1) -r
+fate-av-irdft-$(N): ARGS = -n$(1) -r -i
+fate-av-dct1d-$(N): ARGS = -n$(1) -d
+fate-av-idct1d-$(N): ARGS = -n$(1) -d -i
+endef
+
+$(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_AV_FFT,$(N))))
+
+fate-av-dct-float: $(FATE_AV_DCT-yes)
+fate-av-fft-float: $(FATE_AV_FFT-yes)
+fate-av-mdct-float: $(FATE_AV_MDCT-yes)
+fate-av-rdft-float: $(FATE_AV_RDFT-yes)
+
+FATE_AV_FFT_ALL = $(FATE_AV_DCT-yes) $(FATE_AV_FFT-yes) $(FATE_AV_MDCT-yes) $(FATE_AV_RDFT-yes)
+
+$(FATE_AV_FFT_ALL): libavcodec/tests/avfft$(EXESUF)
+$(FATE_AV_FFT_ALL): CMD = run libavcodec/tests/avfft $(CPUFLAGS:%=-c%) $(ARGS)
+$(FATE_AV_FFT_ALL): REF = /dev/null
+
fate-dct: fate-dct-float
fate-fft: fate-fft-float fate-fft-fixed fate-fft-fixed32
fate-mdct: fate-mdct-float fate-mdct-fixed
fate-rdft: fate-rdft-float
-FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32)
-fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32)
+FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) $(FATE_AV_FFT_ALL)
+fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) $(FATE_AV_FFT_ALL)
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
