From eccd0671cc8981b64cc6cf3188b637258d27da3d Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 02:25:58 +0100 Subject: fate: dependencies for demux tests Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'tests/fate') diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index d9fe6296ef..d917ccada1 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -1,71 +1,71 @@ -FATE_SAMPLES_AVCONV += fate-adts-demux +FATE_SAMPLES_AVCONV-$(CONFIG_AAC_DEMUXER) += fate-adts-demux fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy -FATE_SAMPLES_AVCONV += fate-aea-demux +FATE_SAMPLES_AVCONV-$(CONFIG_AEA_DEMUXER) += fate-aea-demux fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy -FATE_SAMPLES_AVCONV += fate-bink-demux +FATE_SAMPLES_AVCONV-$(CONFIG_BINK_DEMUXER) += fate-bink-demux fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy -FATE_SAMPLES_AVCONV += fate-caf +FATE_SAMPLES_AVCONV-$(CONFIG_CAF_DEMUXER) += fate-caf fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy -FATE_SAMPLES_AVCONV += fate-cdxl-demux +FATE_SAMPLES_AVCONV-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy -FATE_SAMPLES_AVCONV += fate-d-cinema-demux +FATE_SAMPLES_AVCONV-$(CONFIG_DAUD_DEMUXER) += fate-d-cinema-demux fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -FATE_SAMPLES_AVCONV += fate-iv8-demux +FATE_SAMPLES_AVCONV-$(CONFIG_IV8_DEMUXER) += fate-iv8-demux fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy -FATE_SAMPLES_AVCONV += fate-lmlm4-demux +FATE_SAMPLES_AVCONV-$(CONFIG_LMLM4_DEMUXER) += fate-lmlm4-demux fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy -FATE_SAMPLES_AVCONV += fate-maxis-xa +FATE_SAMPLES_AVCONV-$(CONFIG_XA_DEMUXER) += fate-maxis-xa fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy -FATE_SAMPLES_AVCONV += fate-mtv +FATE_SAMPLES_AVCONV-$(CONFIG_MTV_DEMUXER) += fate-mtv fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy -FATE_SAMPLES_AVCONV += fate-mxf-demux +FATE_SAMPLES_AVCONV-$(CONFIG_MXF_DEMUXER) += fate-mxf-demux fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy -FATE_SAMPLES_AVCONV += fate-nc-demux +FATE_SAMPLES_AVCONV-$(CONFIG_NC_DEMUXER) += fate-nc-demux fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy -FATE_SAMPLES_AVCONV += fate-nsv-demux +FATE_SAMPLES_AVCONV-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy -FATE_SAMPLES_AVCONV += fate-oma-demux +FATE_SAMPLES_AVCONV-$(CONFIG_OMA_DEMUXER) += fate-oma-demux fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy -FATE_SAMPLES_AVCONV += fate-psx-str-demux +FATE_SAMPLES_AVCONV-$(CONFIG_STR_DEMUXER) += fate-psx-str-demux fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy -FATE_SAMPLES_AVCONV += fate-pva-demux +FATE_SAMPLES_AVCONV-$(CONFIG_PVA_DEMUXER) += fate-pva-demux fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn -FATE_SAMPLES_AVCONV += fate-qcp-demux +FATE_SAMPLES_AVCONV-$(CONFIG_QCP_DEMUXER) += fate-qcp-demux fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy -FATE_SAMPLES_AVCONV += fate-redcode-demux +FATE_SAMPLES_AVCONV-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy -FATE_SAMPLES_AVCONV += fate-siff +FATE_SAMPLES_AVCONV-$(CONFIG_SIFF_DEMUXER) += fate-siff fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += fate-smjpeg-demux +FATE_SAMPLES_AVCONV-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy -FATE_SAMPLES_AVCONV += fate-westwood-aud +FATE_SAMPLES_AVCONV-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy -FATE_SAMPLES_AVCONV += fate-wtv-demux +FATE_SAMPLES_AVCONV-$(CONFIG_WTV_DEMUXER) += fate-wtv-demux fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy -FATE_SAMPLES_AVCONV += fate-xmv-demux +FATE_SAMPLES_AVCONV-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy -FATE_SAMPLES_AVCONV += fate-xwma-demux +FATE_SAMPLES_AVCONV-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy -- cgit v1.2.3 From b55dda4a72051b6476a40480880b9d9d9d43386e Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 03:15:12 +0100 Subject: fate-als: add dependencies Signed-off-by: Mans Rullgard --- tests/fate/als.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/fate') diff --git a/tests/fate/als.mak b/tests/fate/als.mak index ab3e1c0e94..5ec1189221 100644 --- a/tests/fate/als.mak +++ b/tests/fate/als.mak @@ -7,5 +7,5 @@ endef $(foreach N,$(ALS_SUITE),$(eval $(call FATE_ALS_SUITE,$(N)))) -FATE_SAMPLES_AVCONV += $(FATE_ALS) +FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ALS) += $(FATE_ALS) fate-als: $(FATE_ALS) -- cgit v1.2.3 From 2e05143a8df90dca6e2b22fe2fbdf44424b867c0 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 03:15:26 +0100 Subject: fate-indeo: add dependencies Signed-off-by: Mans Rullgard --- tests/fate/indeo.mak | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/fate') diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak index 783af5d6d5..5a99b46c7f 100644 --- a/tests/fate/indeo.mak +++ b/tests/fate/indeo.mak @@ -1,14 +1,14 @@ -FATE_INDEO += fate-indeo2 +FATE_INDEO-$(call DEMDEC, AVI, INDEO2) += fate-indeo2 fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI -FATE_INDEO += fate-indeo3 +FATE_INDEO-$(call DEMDEC, MOV, INDEO3) += fate-indeo3 fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov -FATE_INDEO += fate-indeo4 +FATE_INDEO-$(call DEMDEC, AVI, INDEO4) += fate-indeo4 fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an -FATE_INDEO += fate-indeo5 +FATE_INDEO-$(call DEMDEC, AVI, INDEO5) += fate-indeo5 fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an -FATE_SAMPLES_AVCONV += $(FATE_INDEO) -fate-indeo: $(FATE_INDEO) +FATE_SAMPLES_AVCONV += $(FATE_INDEO-yes) +fate-indeo: $(FATE_INDEO-yes) -- cgit v1.2.3 From 08c6a12a562d9c55f1d569d1762610e6eea78a79 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 03:16:04 +0100 Subject: fate-mpc: add dependencies Signed-off-by: Mans Rullgard --- tests/fate/mpc.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/fate') diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak index f30ba604ef..53d236ee22 100644 --- a/tests/fate/mpc.mak +++ b/tests/fate/mpc.mak @@ -1,13 +1,13 @@ -FATE_MPC += fate-mpc7-demux +FATE_MPC-$(CONFIG_MPC_DEMUXER) += fate-mpc7-demux fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy -FATE_MPC += fate-mpc8-demux +FATE_MPC-$(CONFIG_MPC8_DEMUXER) += fate-mpc8-demux fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy -FATE_MPC += fate-musepack7 +FATE_MPC-$(call DEMDEC, MPC, MPC7) += fate-musepack7 fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc fate-musepack7: CMP = oneoff fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm -FATE_SAMPLES_AVCONV += $(FATE_MPC) -fate-mpc: $(FATE_MPC) +FATE_SAMPLES_AVCONV += $(FATE_MPC-yes) +fate-mpc: $(FATE_MPC-yes) -- cgit v1.2.3 From 22f5149ec461a403e56b92a43ea860ed6eb2020d Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 03:16:35 +0100 Subject: fate-twinvq: add dependencies Signed-off-by: Mans Rullgard --- tests/fate/vqf.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/fate') diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak index 18676351f6..6256941a1a 100644 --- a/tests/fate/vqf.mak +++ b/tests/fate/vqf.mak @@ -1,7 +1,7 @@ -FATE_SAMPLES_AVCONV += fate-twinvq +FATE_SAMPLES_AVCONV-$(call DEMDEC, VQF, TWINVQ) += fate-twinvq fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf fate-twinvq: CMP = oneoff fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm -FATE_SAMPLES_AVCONV += fate-vqf-demux +FATE_SAMPLES_AVCONV-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc -- cgit v1.2.3 From 55351de9f43deacd202b86975ef053ad57088851 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 03:19:41 +0100 Subject: fate: add dependencies for misc microsoft codecs Signed-off-by: Mans Rullgard --- tests/fate/microsoft.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/fate') diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 48bdb95389..ed361ed31a 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,4 +1,4 @@ -FATE_SAMPLES_AVCONV += fate-msmpeg4v1 +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an FATE_MSVIDEO1 += fate-msvideo1-16bit @@ -7,7 +7,7 @@ fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt FATE_MSVIDEO1 += fate-msvideo1-8bit fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_MSVIDEO1) +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1) fate-msvideo1: $(FATE_MSVIDEO1) FATE_WMV8_DRM += fate-wmv8-drm @@ -17,7 +17,7 @@ fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c3 FATE_WMV8_DRM += fate-wmv8-drm-nodec fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy -FATE_SAMPLES_AVCONV += $(FATE_WMV8_DRM) +FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM) fate-wmv8_drm: $(FATE_WMV8_DRM) FATE_VC1 += fate-vc1_sa00040 -- cgit v1.2.3