---
This is strictly an RFC and not intended for HEAD in its current form.
The DCT and maybe GOLOMB parts could be split off and applied, the rest
needs more work, but at least documents the required dependencies.
 libavcodec/Makefile       |   11 +++++++----
 tests/fate/dct.mak        |    2 +-
 tests/fate/fft.mak        |    6 +++++-
 tests/fate/libavcodec.mak |    4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c0ac316..9e54490 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -739,13 +739,16 @@ SKIPHEADERS-$(HAVE_W32THREADS)         += w32pthreads.h
 EXAMPLES = api
 
 TESTPROGS = cabac                                                       \
-            dct                                                         \
-            fft                                                         \
-            fft-fixed                                                   \
-            golomb                                                      \
             iirfilter                                                   \
             rangecoder                                                  \
 
+TESTPROGS-$(CONFIG_AANDCT)              += dct
+RDFT-TESTPROGS-$(CONFIG_RDFT)            = fft
+DCT-TESTPROGS-$(CONFIG_DCT)              = $(RDFT-TESTPROGS-yes)
+FFT-TESTPROGS-$(CONFIG_MDCT)             = fft-fixed $(DCT-TESTPROGS-yes)
+TESTPROGS-$(CONFIG_FFT)                 += $(FFT-TESTPROGS-yes)
+TESTPROGS-$(CONFIG_GOLOMB)              += golomb
+
 TESTPROGS-$(HAVE_MMX) += motion
 TESTOBJS = dctref.o
 
diff --git a/tests/fate/dct.mak b/tests/fate/dct.mak
index d79cb91..3800e29 100644
--- a/tests/fate/dct.mak
+++ b/tests/fate/dct.mak
@@ -1,4 +1,4 @@
-FATE-yes += fate-idct8x8
+FATE-$(CONFIG_AANDCT) += fate-idct8x8
 fate-idct8x8: libavcodec/dct-test$(EXESUF)
 fate-idct8x8: CMD = run libavcodec/dct-test -i
 fate-idct8x8: REF = /dev/null
diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak
index d3889cc..01aeb81 100644
--- a/tests/fate/fft.mak
+++ b/tests/fate/fft.mak
@@ -38,5 +38,9 @@ $(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF)
 $(FATE_FFT_FIXED): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) 
$(ARGS)
 $(FATE_FFT_FIXED): REF = /dev/null
 
-FATE-$(CONFIG_FFT) += $(FATE_FFT) $(FATE_FFT_FIXED)
+FATE-DCT-$(CONFIG_DCT)        += $(FATE_FFT)
+FATE-MDCT-$(CONFIG_MDCT)      += $(FATE-DCT-yes)
+FATE-FFT-$(CONFIG_RDFT)       += $(FATE-MDCT-yes)
+FATE-FFT-FIXED-$(CONFIG_MDCT) += $(FATE_FFT_FIXED)
+FATE-$(CONFIG_FFT)            += $(FATE-FFT-FIXED-yes) $(FATE-FFT-yes)
 fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED)
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index 2aa9596..d5e659d 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -1,4 +1,4 @@
-FATE_LIBAVCODEC += fate-golomb
+FATE_LIBAVCODEC-$(CONFIG_GOLOMB) += fate-golomb
 fate-golomb: libavcodec/golomb-test$(EXESUF)
 fate-golomb: CMD = run libavcodec/golomb-test
 fate-golomb: REF = /dev/null
@@ -7,4 +7,4 @@ FATE_LIBAVCODEC += fate-iirfilter
 fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
 fate-iirfilter: CMD = run libavcodec/iirfilter-test
 
-fate-libavcodec: $(FATE_LIBAVCODEC)
+fate-libavcodec: $(FATE_LIBAVCODEC) $(FATE_LIBAVCODEC-yes)
-- 
1.7.1

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to