diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-05-19 13:19:19 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-05-19 14:30:41 +0100 |
| commit | 63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (patch) | |
| tree | b4f7786c2ccf5289dacdb66a1e4071916cad8f94 | |
| parent | 8ccc1c597534ece9f3710a979b8a3fd6e43220a6 (diff) | |
| download | ffmpeg-63dcd16d567862d94fe4b178e47f440e8ad6a2c9.tar.gz | |
fate: fix dependencies on SAMPLES being set
This allows fate to run without errors with or without SAMPLES
being set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
38 files changed, 209 insertions, 204 deletions
diff --git a/tests/Makefile b/tests/Makefile index 1c8d4b6e05..55e8867d4e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -80,14 +80,18 @@ FATE = $(FATE_ACODEC) \ $(FATE_SEEK) \ FATE_AVCONV += $(FATE_AVCONV-yes) +FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI) +FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV) +FATE_SAMPLES += $(FATE_SAMPLES-yes) + FATE += $(FATE-yes) FATE += $(FATE_LIBAVUTIL) -$(FATE_AVCONV): avconv$(EXESUF) +$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF) $(filter-out %-aref,$(FATE_ACODEC)): $(AREF) $(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref @@ -111,14 +115,14 @@ fate-lavfi: $(FATE_LAVFI) fate-seek: $(FATE_SEEK) ifdef SAMPLES -FATE += $(FATE_AVCONV) +FATE += $(FATE_SAMPLES) fate-rsync: rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES) else fate-rsync: @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite" -$(FATE_TESTS): - @echo "SAMPLES not specified, cannot run FATE" +$(FATE_SAMPLES): + @echo "$@ requires external samples and SAMPLES not specified"; false endif FATE_UTILS = base64 tiny_psnr diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index b40daf1b9f..9d52dae49b 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -71,7 +71,7 @@ FATE_AAC_CT = sbr_bc-ps_i.3gp \ FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%) -FATE_AVCONV += $(FATE_AAC) +FATE_SAMPLES_AVCONV += $(FATE_AAC) fate-aac: $(FATE_AAC) $(FATE_AAC): CMP = oneoff $(FATE_AAC): FUZZ = 2 diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 6db61bd074..5a5169d624 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -46,5 +46,5 @@ fate-eac3-encode: CMP_TARGET = 514.02 fate-eac3-encode: SIZE_TOLERANCE = 488 fate-eac3-encode: FUZZ = 3 -FATE_AVCONV += $(FATE_AC3) +FATE_SAMPLES_AVCONV += $(FATE_AC3) fate-ac3: $(FATE_AC3) diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 8a96851cb1..4205168dca 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -70,5 +70,5 @@ fate-adpcm-xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn FATE_ADPCM += fate-adpcm_ms-stereo fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le -FATE_AVCONV += $(FATE_ADPCM) +FATE_SAMPLES_AVCONV += $(FATE_ADPCM) fate-adpcm: $(FATE_ADPCM) diff --git a/tests/fate/als.mak b/tests/fate/als.mak index b75dab4853..ab3e1c0e94 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_AVCONV += $(FATE_ALS) +FATE_SAMPLES_AVCONV += $(FATE_ALS) fate-als: $(FATE_ALS) diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak index 917b81a406..1fe138136c 100644 --- a/tests/fate/amrnb.mak +++ b/tests/fate/amrnb.mak @@ -46,5 +46,5 @@ fate-amrnb-12k2: CMP = stddev fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm fate-amrnb-12k2: FUZZ = 1 -FATE_AVCONV += $(FATE_AMRNB) +FATE_SAMPLES_AVCONV += $(FATE_AMRNB) fate-amrnb: $(FATE_AMRNB) diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index 112262940e..571fac0b35 100644 --- a/tests/fate/amrwb.mak +++ b/tests/fate/amrwb.mak @@ -58,5 +58,5 @@ fate-amrwb-23k85-2: CMP = stddev fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm fate-amrwb-23k85-2: FUZZ = 1 -FATE_AVCONV += $(FATE_AMRWB) +FATE_SAMPLES_AVCONV += $(FATE_AMRWB) fate-amrwb: $(FATE_AMRWB) diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak index 5e6bd95c3b..3897311610 100644 --- a/tests/fate/atrac.mak +++ b/tests/fate/atrac.mak @@ -18,5 +18,5 @@ fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav fate-atrac3-3: CMP = oneoff fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm -FATE_AVCONV += $(FATE_ATRAC) +FATE_SAMPLES_AVCONV += $(FATE_ATRAC) fate-atrac: $(FATE_ATRAC) diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 7a201e0800..3109adc480 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -10,35 +10,35 @@ fate-binkaudio-rdft: CMP = oneoff fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm fate-binkaudio-rdft: FUZZ = 2 -FATE_AVCONV += $(FATE_BINKAUDIO) +FATE_SAMPLES_AVCONV += $(FATE_BINKAUDIO) fate-binkaudio: $(FATE_BINKAUDIO) -FATE_AVCONV += fate-bmv-audio +FATE_SAMPLES_AVCONV += fate-bmv-audio fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn -FATE_AVCONV += fate-delphine-cin-audio +FATE_SAMPLES_AVCONV += fate-delphine-cin-audio fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn -FATE_AVCONV += fate-dts +FATE_SAMPLES_AVCONV += fate-dts fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts fate-dts: CMP = oneoff fate-dts: REF = $(SAMPLES)/dts/dts.pcm -FATE_AVCONV += fate-imc +FATE_SAMPLES_AVCONV += fate-imc fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi fate-imc: CMP = oneoff fate-imc: REF = $(SAMPLES)/imc/imc.pcm -FATE_AVCONV += fate-nellymoser +FATE_SAMPLES_AVCONV += fate-nellymoser fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm -FATE_AVCONV += fate-sierra-vmd-audio +FATE_SAMPLES_AVCONV += fate-sierra-vmd-audio fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn -FATE_AVCONV += fate-smacker-audio +FATE_SAMPLES_AVCONV += fate-smacker-audio fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn -FATE_AVCONV += fate-ws_snd +FATE_SAMPLES_AVCONV += fate-ws_snd fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak index 4a01bb0e2a..c6601902f5 100644 --- a/tests/fate/bmp.mak +++ b/tests/fate/bmp.mak @@ -37,5 +37,5 @@ fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-rle8 fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 -FATE_AVCONV += $(FATE_BMP) +FATE_SAMPLES_AVCONV += $(FATE_BMP) fate-bmp: $(FATE_BMP) diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 2cec5d2a59..86eaa09d0a 100644 --- a/tests/fate/cdxl.mak +++ b/tests/fate/cdxl.mak @@ -13,5 +13,5 @@ fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt FATE_CDXL += fate-cdxl-bitline-ham6 fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10 -FATE_AVCONV += $(FATE_CDXL) +FATE_SAMPLES_AVCONV += $(FATE_CDXL) fate-cdxl: $(FATE_CDXL) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index fd317b7add..d9fe6296ef 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -1,71 +1,71 @@ -FATE_AVCONV += fate-adts-demux +FATE_SAMPLES_AVCONV += fate-adts-demux fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy -FATE_AVCONV += fate-aea-demux +FATE_SAMPLES_AVCONV += fate-aea-demux fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy -FATE_AVCONV += fate-bink-demux +FATE_SAMPLES_AVCONV += fate-bink-demux fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy -FATE_AVCONV += fate-caf +FATE_SAMPLES_AVCONV += fate-caf fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy -FATE_AVCONV += fate-cdxl-demux +FATE_SAMPLES_AVCONV += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy -FATE_AVCONV += fate-d-cinema-demux +FATE_SAMPLES_AVCONV += fate-d-cinema-demux fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -FATE_AVCONV += fate-iv8-demux +FATE_SAMPLES_AVCONV += fate-iv8-demux fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy -FATE_AVCONV += fate-lmlm4-demux +FATE_SAMPLES_AVCONV += fate-lmlm4-demux fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy -FATE_AVCONV += fate-maxis-xa +FATE_SAMPLES_AVCONV += fate-maxis-xa fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy -FATE_AVCONV += fate-mtv +FATE_SAMPLES_AVCONV += fate-mtv fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy -FATE_AVCONV += fate-mxf-demux +FATE_SAMPLES_AVCONV += fate-mxf-demux fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy -FATE_AVCONV += fate-nc-demux +FATE_SAMPLES_AVCONV += fate-nc-demux fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy -FATE_AVCONV += fate-nsv-demux +FATE_SAMPLES_AVCONV += fate-nsv-demux fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy -FATE_AVCONV += fate-oma-demux +FATE_SAMPLES_AVCONV += fate-oma-demux fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy -FATE_AVCONV += fate-psx-str-demux +FATE_SAMPLES_AVCONV += fate-psx-str-demux fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy -FATE_AVCONV += fate-pva-demux +FATE_SAMPLES_AVCONV += fate-pva-demux fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn -FATE_AVCONV += fate-qcp-demux +FATE_SAMPLES_AVCONV += fate-qcp-demux fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy -FATE_AVCONV += fate-redcode-demux +FATE_SAMPLES_AVCONV += fate-redcode-demux fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy -FATE_AVCONV += fate-siff +FATE_SAMPLES_AVCONV += fate-siff fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -FATE_AVCONV += fate-smjpeg-demux +FATE_SAMPLES_AVCONV += fate-smjpeg-demux fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy -FATE_AVCONV += fate-westwood-aud +FATE_SAMPLES_AVCONV += fate-westwood-aud fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy -FATE_AVCONV += fate-wtv-demux +FATE_SAMPLES_AVCONV += fate-wtv-demux fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy -FATE_AVCONV += fate-xmv-demux +FATE_SAMPLES_AVCONV += fate-xmv-demux fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy -FATE_AVCONV += fate-xwma-demux +FATE_SAMPLES_AVCONV += fate-xwma-demux fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak index e83683959b..56f7bfeeb9 100644 --- a/tests/fate/dfa.mak +++ b/tests/fate/dfa.mak @@ -31,5 +31,5 @@ fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb2 FATE_DFA += fate-dfa11 fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 -FATE_AVCONV += $(FATE_DFA) +FATE_SAMPLES_AVCONV += $(FATE_DFA) fate-dfa: $(FATE_DFA) diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak index c4dd9d52ec..14e77a20f4 100644 --- a/tests/fate/dpcm.mak +++ b/tests/fate/dpcm.mak @@ -10,5 +10,5 @@ fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le FATE_DPCM += fate-dpcm-xan fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le -FATE_AVCONV += $(FATE_DPCM) +FATE_SAMPLES_AVCONV += $(FATE_DPCM) fate-dpcm: $(FATE_DPCM) diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak index 3d016d20b5..59745fa29e 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -1,20 +1,20 @@ -FATE_AVCONV += fate-ea-cdata +FATE_SAMPLES_AVCONV += fate-ea-cdata fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le -FATE_AVCONV += fate-ea-cmv +FATE_SAMPLES_AVCONV += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -FATE_AVCONV += fate-ea-tgq +FATE_SAMPLES_AVCONV += fate-ea-tgq fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an -FATE_AVCONV += fate-ea-tqi +FATE_SAMPLES_AVCONV += fate-ea-tqi fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an -FATE_AVCONV += fate-ea-mad +FATE_SAMPLES_AVCONV += fate-ea-mad fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an -FATE_AVCONV += fate-ea-tgv-1 +FATE_SAMPLES_AVCONV += fate-ea-tgv-1 fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an -FATE_AVCONV += fate-ea-tgv-2 +FATE_SAMPLES_AVCONV += fate-ea-tgv-2 fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 2e8521af82..8f27995f4f 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -177,7 +177,7 @@ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ fate-h264-extreme-plane-pred \ fate-h264-bsf-mp4toannexb \ -FATE_AVCONV += $(FATE_H264) +FATE_SAMPLES_AVCONV += $(FATE_H264) fate-h264: $(FATE_H264) fate-h264-conformance-aud_mw_e: CMD = framecrc -i $(SAMPLES)/h264-conformance/AUD_MW_E.264 diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 4ea9290acd..a6768a0be1 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,10 +1,10 @@ -FATE_AVCONV += fate-dpx +FATE_SAMPLES_AVCONV += fate-dpx fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_AVCONV += fate-pictor +FATE_SAMPLES_AVCONV += fate-pictor fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -FATE_AVCONV += fate-ptx +FATE_SAMPLES_AVCONV += fate-ptx fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 FATE_SUNRASTER += fate-sunraster-1bit-raw @@ -28,7 +28,7 @@ fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw. FATE_SUNRASTER += fate-sunraster-24bit-rle fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun -FATE_AVCONV += $(FATE_SUNRASTER) +FATE_SAMPLES_AVCONV += $(FATE_SUNRASTER) fate-sunraster: $(FATE_SUNRASTER) FATE_TARGA = CBW8 \ @@ -45,7 +45,7 @@ FATE_TARGA = CBW8 \ FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ fate-targa-top-to-bottom -FATE_AVCONV += $(FATE_TARGA) +FATE_SAMPLES_AVCONV += $(FATE_TARGA) fate-targa: $(FATE_TARGA) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA @@ -67,5 +67,5 @@ fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF FATE_TIFF += fate-tiff-fax-g3s fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF -FATE_AVCONV += $(FATE_TIFF) +FATE_SAMPLES_AVCONV += $(FATE_TIFF) fate-tiff: $(FATE_TIFF) diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak index fbffe4a89c..783af5d6d5 100644 --- a/tests/fate/indeo.mak +++ b/tests/fate/indeo.mak @@ -10,5 +10,5 @@ fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an FATE_INDEO += fate-indeo5 fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an -FATE_AVCONV += $(FATE_INDEO) +FATE_SAMPLES_AVCONV += $(FATE_INDEO) fate-indeo: $(FATE_INDEO) diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 18cf9114b3..f0ff49649e 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -1,17 +1,17 @@ -FATE_AVCONV += fate-lossless-alac +FATE_SAMPLES_AVCONV += fate-lossless-alac fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le -FATE_AVCONV += fate-lossless-meridianaudio +FATE_SAMPLES_AVCONV += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le -FATE_AVCONV += fate-lossless-monkeysaudio +FATE_SAMPLES_AVCONV += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le -FATE_AVCONV += fate-lossless-shorten +FATE_SAMPLES_AVCONV += fate-lossless-shorten fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le -FATE_AVCONV += fate-lossless-tta +FATE_SAMPLES_AVCONV += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta -FATE_AVCONV += fate-lossless-wma +FATE_SAMPLES_AVCONV += fate-lossless-wma fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index e5db11aa8c..4871296a18 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -4,20 +4,20 @@ fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi FATE_LOCO += fate-loco-yuy2 fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi -FATE_AVCONV += $(FATE_LOCO) +FATE_SAMPLES_AVCONV += $(FATE_LOCO) fate-loco: $(FATE_LOCO) -FATE_AVCONV += fate-msrle-8bit +FATE_SAMPLES_AVCONV += fate-msrle-8bit fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 -FATE_AVCONV += fate-mszh +FATE_SAMPLES_AVCONV += fate-mszh fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi -FATE_AVCONV += fate-vble +FATE_SAMPLES_AVCONV += fate-vble fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi -FATE_AVCONV += fate-zlib +FATE_SAMPLES_AVCONV += fate-zlib fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi -FATE_AVCONV += fate-zerocodec +FATE_SAMPLES_AVCONV += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 3e55f4066c..515f6ab6f8 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,4 +1,4 @@ -FATE_AVCONV += fate-msmpeg4v1 +FATE_SAMPLES_AVCONV += 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_AVCONV += $(FATE_MSVIDEO1) +FATE_SAMPLES_AVCONV += $(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_AVCONV += $(FATE_WMV8_DRM) +FATE_SAMPLES_AVCONV += $(FATE_WMV8_DRM) fate-wmv8_drm: $(FATE_WMV8_DRM) FATE_VC1 += fate-vc1_sa00040 @@ -35,5 +35,5 @@ fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 FATE_VC1 += fate-vc1-ism fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an -FATE_AVCONV += $(FATE_VC1) +FATE_SAMPLES_AVCONV += $(FATE_VC1) fate-vc1: $(FATE_VC1) diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index 26a77d0b9d..d3ddea9789 100644 --- a/tests/fate/mp3.mak +++ b/tests/fate/mp3.mak @@ -38,7 +38,7 @@ fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/e fate-mp3-float-extra_overread: CMP = stddev fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm -FATE_AVCONV += $(FATE_MP3) +FATE_SAMPLES_AVCONV += $(FATE_MP3) fate-mp3: $(FATE_MP3) $(FATE_MP3): CMP = stddev $(FATE_MP3): FUZZ = 0.07 diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak index 4fccea06ff..6f429d3b95 100644 --- a/tests/fate/mpc.mak +++ b/tests/fate/mpc.mak @@ -10,5 +10,5 @@ fate-musepack7: CMP = oneoff fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm fate-musepack7: FUZZ = 1 -FATE_AVCONV += $(FATE_MPC) +FATE_SAMPLES_AVCONV += $(FATE_MPC) fate-mpc: $(FATE_MPC) diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index d4eb24fa51..c84de9e47f 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -1,25 +1,25 @@ -FATE_PCM += fate-iff-pcm +FATE_SAMPLES_PCM += fate-iff-pcm fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le -FATE_PCM += fate-pcm_dvd +FATE_SAMPLES_PCM += fate-pcm_dvd fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn -FATE_PCM += fate-pcm-planar +FATE_SAMPLES_PCM += fate-pcm-planar fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn -FATE_PCM += fate-pcm_s16be-stereo +FATE_SAMPLES_PCM += fate-pcm_s16be-stereo fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le -FATE_PCM += fate-pcm_s16le-stereo +FATE_SAMPLES_PCM += fate-pcm_s16le-stereo fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le -FATE_PCM += fate-pcm_u8-mono +FATE_SAMPLES_PCM += fate-pcm_u8-mono fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le -FATE_PCM += fate-pcm_u8-stereo +FATE_SAMPLES_PCM += fate-pcm_u8-stereo fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le -FATE_PCM += fate-w64 +FATE_SAMPLES_PCM += fate-w64 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64 FATE_PCM += fate-dcinema-encode @@ -28,4 +28,5 @@ fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud FATE_AVCONV += $(FATE_PCM) -fate-pcm: $(FATE_PCM) +FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM) +fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM) diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak index ae50704770..73bc5cbf40 100644 --- a/tests/fate/probe.mak +++ b/tests/fate/probe.mak @@ -10,7 +10,7 @@ fate-probe-format-roundup1414: REF = mpeg FATE_PROBE_FORMAT += fate-probe-format-roundup2015 fate-probe-format-roundup2015: REF = dv -FATE-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT) +FATE_SAMPLES-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT) $(FATE_PROBE_FORMAT): avprobe$(EXESUF) diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index 6112e7f54b..1d76fff942 100644 --- a/tests/fate/prores.mak +++ b/tests/fate/prores.mak @@ -4,7 +4,7 @@ FATE_PRORES = fate-prores-422 \ fate-prores-422_proxy \ fate-prores-alpha \ -FATE_AVCONV += $(FATE_PRORES) +FATE_SAMPLES_AVCONV += $(FATE_PRORES) fate-prores: $(FATE_PRORES) fate-prores-422: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak index cab09fefef..b2b9500666 100644 --- a/tests/fate/qt.mak +++ b/tests/fate/qt.mak @@ -1,50 +1,50 @@ -FATE_AVCONV += fate-8bps +FATE_SAMPLES_AVCONV += fate-8bps fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 -FATE_AVCONV += fate-qdm2 +FATE_SAMPLES_AVCONV += fate-qdm2 fate-qdm2: CMD = pcm -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov fate-qdm2: CMP = oneoff fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm fate-qdm2: FUZZ = 2 -FATE_AVCONV += fate-qt-alaw-mono +FATE_SAMPLES_AVCONV += fate-qt-alaw-mono fate-qt-alaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le -FATE_AVCONV += fate-qt-alaw-stereo +FATE_SAMPLES_AVCONV += fate-qt-alaw-stereo fate-qt-alaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le -FATE_AVCONV += fate-qt-ima4-mono +FATE_SAMPLES_AVCONV += fate-qt-ima4-mono fate-qt-ima4-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le -FATE_AVCONV += fate-qt-ima4-stereo +FATE_SAMPLES_AVCONV += fate-qt-ima4-stereo fate-qt-ima4-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le -FATE_AVCONV += fate-qt-mac3-mono +FATE_SAMPLES_AVCONV += fate-qt-mac3-mono fate-qt-mac3-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le -FATE_AVCONV += fate-qt-mac3-stereo +FATE_SAMPLES_AVCONV += fate-qt-mac3-stereo fate-qt-mac3-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le -FATE_AVCONV += fate-qt-mac6-mono +FATE_SAMPLES_AVCONV += fate-qt-mac6-mono fate-qt-mac6-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le -FATE_AVCONV += fate-qt-mac6-stereo +FATE_SAMPLES_AVCONV += fate-qt-mac6-stereo fate-qt-mac6-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le -FATE_AVCONV += fate-qt-ulaw-mono +FATE_SAMPLES_AVCONV += fate-qt-ulaw-mono fate-qt-ulaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le -FATE_AVCONV += fate-qt-ulaw-stereo +FATE_SAMPLES_AVCONV += fate-qt-ulaw-stereo fate-qt-ulaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le -FATE_AVCONV += fate-quickdraw +FATE_SAMPLES_AVCONV += fate-quickdraw fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 -FATE_AVCONV += fate-rpza +FATE_SAMPLES_AVCONV += fate-rpza fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 -FATE_AVCONV += fate-svq1 +FATE_SAMPLES_AVCONV += fate-svq1 fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 -FATE_AVCONV += fate-svq3 +FATE_SAMPLES_AVCONV += fate-svq3 fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak index 2f47c29105..3850a8097b 100644 --- a/tests/fate/qtrle.mak +++ b/tests/fate/qtrle.mak @@ -19,5 +19,5 @@ fate-qtrle-24bit: CMD = framecrc -i $(SAMPLES)/qtrle/aletrek-rle.mov FATE_QTRLE += fate-qtrle-32bit fate-qtrle-32bit: CMD = framecrc -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24 -FATE_AVCONV += $(FATE_QTRLE) +FATE_SAMPLES_AVCONV += $(FATE_QTRLE) fate-qtrle: $(FATE_QTRLE) diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 7893e2f82f..2d450c39ad 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -1,24 +1,24 @@ -FATE_AVCONV += fate-ra-144 +FATE_SAMPLES_AVCONV += fate-ra-144 fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le -FATE_AVCONV += fate-ra-288 +FATE_SAMPLES_AVCONV += fate-ra-288 fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm fate-ra-288: CMP = oneoff fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm fate-ra-288: FUZZ = 2 -FATE_AVCONV += fate-ra-cook +FATE_SAMPLES_AVCONV += fate-ra-cook fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm -FATE_AVCONV += fate-ralf +FATE_SAMPLES_AVCONV += fate-ralf fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le -FATE_AVCONV += fate-rv30 +FATE_SAMPLES_AVCONV += fate-rv30 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an -FATE_AVCONV += fate-rv40 +FATE_SAMPLES_AVCONV += fate-rv40 fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0 FATE_SIPR += fate-sipr-5k0 @@ -41,5 +41,5 @@ fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm fate-sipr-16k: CMP = oneoff fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm -FATE_AVCONV += $(FATE_SIPR) +FATE_SAMPLES_AVCONV += $(FATE_SIPR) fate-sipr: $(FATE_SIPR) diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 2dc04c69a7..8ae7e90ab7 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -1,8 +1,8 @@ # FIXME dropped frames in this test because of coarse timebase -FATE_AVCONV += fate-cscd +FATE_SAMPLES_AVCONV += fate-cscd fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 -FATE_AVCONV += fate-dxtory +FATE_SAMPLES_AVCONV += fate-dxtory fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi FATE_FRAPS += fate-fraps-v0 @@ -23,7 +23,7 @@ fate-fraps-v4: CMD = framecrc -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nos FATE_FRAPS += fate-fraps-v5 fate-fraps-v5: CMD = framecrc -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -FATE_AVCONV += $(FATE_FRAPS) +FATE_SAMPLES_AVCONV += $(FATE_FRAPS) fate-fraps: $(FATE_FRAPS) FATE_TSCC += fate-tscc-15bit @@ -32,7 +32,7 @@ fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -FATE_AVCONV += $(FATE_TSCC) +FATE_SAMPLES_AVCONV += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) FATE_VMNC += fate-vmnc-16bit @@ -41,7 +41,7 @@ fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24 FATE_VMNC += fate-vmnc-32bit fate-vmnc-32bit: CMD = framecrc -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 -FATE_AVCONV += $(FATE_VMNC) +FATE_SAMPLES_AVCONV += $(FATE_VMNC) fate-vmnc: $(FATE_VMNC) FATE_ZMBV += fate-zmbv-8bit @@ -56,5 +56,5 @@ fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 -FATE_AVCONV += $(FATE_ZMBV) +FATE_SAMPLES_AVCONV += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 81f631afd9..4e350f722e 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -22,5 +22,5 @@ fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_le FATE_UTVIDEO += fate-utvideo_yuv422_median fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi -FATE_AVCONV += $(FATE_UTVIDEO) +FATE_SAMPLES_AVCONV += $(FATE_UTVIDEO) fate-utvideo: $(FATE_UTVIDEO) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index fc7632ea09..2ae028ed7f 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -4,52 +4,52 @@ fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an FATE_4XM += fate-4xm-2 fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an -FATE_AVCONV += $(FATE_4XM) +FATE_SAMPLES_AVCONV += $(FATE_4XM) fate-4xm: $(FATE_4XM) -FATE_AVCONV += fate-aasc +FATE_SAMPLES_AVCONV += fate-aasc fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24 -FATE_AVCONV += fate-alg-mm +FATE_SAMPLES_AVCONV += fate-alg-mm fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 -FATE_AVCONV += fate-amv +FATE_SAMPLES_AVCONV += fate-amv fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an -FATE_AVCONV += fate-ansi +FATE_SAMPLES_AVCONV += fate-ansi fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 -FATE_AVCONV += fate-armovie-escape124 +FATE_SAMPLES_AVCONV += fate-armovie-escape124 fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 -FATE_AVCONV += fate-auravision-v1 +FATE_SAMPLES_AVCONV += fate-auravision-v1 fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an -FATE_AVCONV += fate-auravision-v2 +FATE_SAMPLES_AVCONV += fate-auravision-v2 fate-auravision-v2: CMD = framecrc -i $(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an -FATE_AVCONV += fate-bethsoft-vid +FATE_SAMPLES_AVCONV += fate-bethsoft-vid fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 -FATE_AVCONV += fate-bfi +FATE_SAMPLES_AVCONV += fate-bfi fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 -FATE_AVCONV += fate-bink-video +FATE_SAMPLES_AVCONV += fate-bink-video fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik -FATE_AVCONV += fate-bmv-video +FATE_SAMPLES_AVCONV += fate-bmv-video fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -FATE_AVCONV += fate-cdgraphics +FATE_SAMPLES_AVCONV += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1 -FATE_AVCONV += fate-cljr +FATE_SAMPLES_AVCONV += fate-cljr fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi -FATE_AVCONV += fate-corepng +FATE_SAMPLES_AVCONV += fate-corepng fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi -FATE_AVCONV += fate-creatureshock-avs +FATE_SAMPLES_AVCONV += fate-creatureshock-avs fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 FATE_CVID += fate-cvid-partial @@ -61,19 +61,19 @@ fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial. FATE_CVID += fate-cvid-grayscale fate-cvid-grayscale: CMD = framecrc -i $(SAMPLES)/cvid/pcitva15.avi -an -FATE_AVCONV += $(FATE_CVID) +FATE_SAMPLES_AVCONV += $(FATE_CVID) fate-cvid: $(FATE_CVID) -FATE_AVCONV += fate-cyberia-c93 +FATE_SAMPLES_AVCONV += fate-cyberia-c93 fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24 -FATE_AVCONV += fate-cyuv +FATE_SAMPLES_AVCONV += fate-cyuv fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi -FATE_AVCONV += fate-delphine-cin-video +FATE_SAMPLES_AVCONV += fate-delphine-cin-video fate-delphine-cin-video: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an -FATE_AVCONV += fate-deluxepaint-anm +FATE_SAMPLES_AVCONV += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 FATE_TRUEMOTION1 += fate-truemotion1-15 @@ -82,10 +82,10 @@ fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt r FATE_TRUEMOTION1 += fate-truemotion1-24 fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an -FATE_AVCONV += $(FATE_TRUEMOTION1) +FATE_SAMPLES_AVCONV += $(FATE_TRUEMOTION1) fate-truemotion1: $(FATE_TRUEMOTION1) -FATE_AVCONV += fate-truemotion2 +FATE_SAMPLES_AVCONV += fate-truemotion2 fate-truemotion2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi FATE_DXA += fate-dxa-feeble @@ -94,10 +94,10 @@ fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rg FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 -FATE_AVCONV += $(FATE_DXA) +FATE_SAMPLES_AVCONV += $(FATE_DXA) fate-dxa: $(FATE_DXA) -FATE_PCM += fate-film-cvid +FATE_SAMPLES_AVCONV += fate-film-cvid fate-film-cvid: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk -an FATE_FLIC += fate-flic-af11-palette-change @@ -109,16 +109,16 @@ fate-flic-af12: CMD = framecrc -i $(SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24 FATE_FLIC += fate-flic-magiccarpet fate-flic-magiccarpet: CMD = framecrc -i $(SAMPLES)/fli/intel.dat -pix_fmt rgb24 -FATE_AVCONV += $(FATE_FLIC) +FATE_SAMPLES_AVCONV += $(FATE_FLIC) fate-flic: $(FATE_FLIC) -FATE_AVCONV += fate-frwu +FATE_SAMPLES_AVCONV += fate-frwu fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi -FATE_AVCONV += fate-id-cin-video +FATE_SAMPLES_AVCONV += fate-id-cin-video fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 -FATE_AVCONV += fate-idroq-video-encode +FATE_SAMPLES_AVCONV += fate-idroq-video-encode fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2 FATE_IFF += fate-iff-byterun1 @@ -130,77 +130,77 @@ fate-iff-fibonacci: CMD = md5 -i $(SAMPLES)/iff/dasboot-in-compressed -f s16le FATE_IFF += fate-iff-ilbm fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 -FATE_AVCONV += $(FATE_IFF) +FATE_SAMPLES_AVCONV += $(FATE_IFF) fate-iff: $(FATE_IFF) -FATE_AVCONV += fate-interplay-mve-8bit +FATE_SAMPLES_AVCONV += fate-interplay-mve-8bit fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an -FATE_AVCONV += fate-interplay-mve-16bit +FATE_SAMPLES_AVCONV += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an -FATE_AVCONV += fate-kgv1 +FATE_SAMPLES_AVCONV += fate-kgv1 fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an -FATE_AVCONV += fate-kmvc +FATE_SAMPLES_AVCONV += fate-kmvc fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 -FATE_AVCONV += fate-mdec +FATE_SAMPLES_AVCONV += fate-mdec fate-mdec: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an -FATE_AVCONV += fate-mdec-v3 +FATE_SAMPLES_AVCONV += fate-mdec-v3 fate-mdec-v3: CMD = framecrc -idct simple -i $(SAMPLES)/psx-str/abc000_cut.str -an -FATE_AVCONV += fate-mimic +FATE_SAMPLES_AVCONV += fate-mimic fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -FATE_AVCONV += fate-mjpegb +FATE_SAMPLES_AVCONV += fate-mjpegb fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an -FATE_AVCONV += fate-motionpixels +FATE_SAMPLES_AVCONV += fate-motionpixels fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111 -FATE_AVCONV += fate-mpeg2-field-enc +FATE_SAMPLES_AVCONV += fate-mpeg2-field-enc fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an # FIXME dropped frames in this test because of coarse timebase -FATE_AVCONV += fate-nuv +FATE_SAMPLES_AVCONV += fate-nuv fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an -FATE_AVCONV += fate-qpeg +FATE_SAMPLES_AVCONV += fate-qpeg fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 -FATE_AVCONV += fate-r210 +FATE_SAMPLES_AVCONV += fate-r210 fate-r210: CMD = framecrc -i $(SAMPLES)/r210/r210.avi -pix_fmt rgb48le -FATE_AVCONV += fate-rl2 +FATE_SAMPLES_AVCONV += fate-rl2 fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an -FATE_AVCONV += fate-roqvideo +FATE_SAMPLES_AVCONV += fate-roqvideo fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an -FATE_AVCONV += fate-sierra-vmd-video +FATE_SAMPLES_AVCONV += fate-sierra-vmd-video fate-sierra-vmd-video: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an -FATE_AVCONV += fate-smacker-video +FATE_SAMPLES_AVCONV += fate-smacker-video fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an -FATE_AVCONV += fate-smc +FATE_SAMPLES_AVCONV += fate-smc fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 -FATE_AVCONV += fate-sp5x +FATE_SAMPLES_AVCONV += fate-sp5x fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi -FATE_AVCONV += fate-sub-srt +FATE_SAMPLES_AVCONV += fate-sub-srt fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass -FATE_AVCONV += fate-thp +FATE_SAMPLES_AVCONV += fate-thp fate-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -an -FATE_AVCONV += fate-tiertex-seq +FATE_SAMPLES_AVCONV += fate-tiertex-seq fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 -FATE_AVCONV += fate-tmv +FATE_SAMPLES_AVCONV += fate-tmv fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 FATE_TXD += fate-txd-16bpp @@ -209,39 +209,39 @@ fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an FATE_TXD += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an -FATE_AVCONV += $(FATE_TXD) +FATE_SAMPLES_AVCONV += $(FATE_TXD) fate-txd: $(FATE_TXD) -FATE_AVCONV += fate-ulti +FATE_SAMPLES_AVCONV += fate-ulti fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an -FATE_AVCONV += fate-v210 +FATE_SAMPLES_AVCONV += fate-v210 fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an -FATE_AVCONV += fate-v410dec +FATE_SAMPLES_AVCONV += fate-v410dec fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le -FATE_AVCONV += fate-v410enc +FATE_SAMPLES_AVCONV += fate-v410enc fate-v410enc: tests/vsynth1/00.pgm fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi -FATE_AVCONV += fate-vcr1 +FATE_SAMPLES_AVCONV += fate-vcr1 fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an -FATE_AVCONV += fate-videoxl +FATE_SAMPLES_AVCONV += fate-videoxl fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi -FATE_AVCONV += fate-vqa-cc +FATE_SAMPLES_AVCONV += fate-vqa-cc fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an -FATE_AVCONV += fate-wc3movie-xan +FATE_SAMPLES_AVCONV += fate-wc3movie-xan fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 -FATE_AVCONV += fate-wnv1 +FATE_SAMPLES_AVCONV += fate-wnv1 fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -an -FATE_AVCONV += fate-yop +FATE_SAMPLES_AVCONV += fate-yop fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an -FATE_AVCONV += fate-xxan-wc4 +FATE_SAMPLES_AVCONV += fate-xxan-wc4 fate-xxan-wc4: CMD = framecrc -i $(SAMPLES)/wc4-xan/wc4trailer-partial.avi -an diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index 9bfbee6aad..fc0e530ee6 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -6,7 +6,7 @@ fate-g722-encode: tests/data/asynth-16000-1.wav fate-g722-encode: SRC = tests/data/asynth-16000-1.wav fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722 -FATE_AVCONV += $(FATE_G722) +FATE_SAMPLES_AVCONV += $(FATE_G722) fate-g722: $(FATE_G722) FATE_G726 += fate-g726-encode-2bit @@ -29,7 +29,7 @@ fate-g726-encode-5bit: tests/data/asynth-8000-1.wav fate-g726-encode-5bit: SRC = tests/data/asynth-8000-1.wav fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k -FATE_AVCONV += $(FATE_G726) +FATE_SAMPLES_AVCONV += $(FATE_G726) fate-g726: $(FATE_G726) FATE_GSM += fate-gsm-ms @@ -38,15 +38,15 @@ fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav FATE_GSM += fate-gsm-toast fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10 -FATE_AVCONV += $(FATE_GSM) +FATE_SAMPLES_AVCONV += $(FATE_GSM) fate-gsm: $(FATE_GSM) -FATE_AVCONV += fate-qcelp +FATE_SAMPLES_AVCONV += fate-qcelp fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP fate-qcelp: CMP = oneoff fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm -FATE_AVCONV += fate-truespeech +FATE_SAMPLES_AVCONV += fate-truespeech fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav fate-truespeech: CMP = oneoff fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 578d7c4871..802c529e4d 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -76,6 +76,6 @@ FATE_VORBIS += fate-vorbis-19 fate-vorbis-19: CMD = pcm -i $(SAMPLES)/vorbis/test-short2_small.ogg fate-vorbis-19: REF = $(SAMPLES)/vorbis/test-short2_small.pcm -FATE_AVCONV += $(FATE_VORBIS) +FATE_SAMPLES_AVCONV += $(FATE_VORBIS) fate-vorbis: $(FATE_VORBIS) $(FATE_VORBIS): CMP = oneoff diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 9b0be7ac6d..4c1ed0d07d 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -4,10 +4,10 @@ fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi FATE_VP3 += fate-vp3-coeff-level64 fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv -FATE_AVCONV += $(FATE_VP3) +FATE_SAMPLES_AVCONV += $(FATE_VP3) fate-vp3: $(FATE_VP3) -FATE_AVCONV += fate-vp5 +FATE_SAMPLES_AVCONV += fate-vp5 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an FATE_VP6 += fate-vp60 @@ -22,7 +22,7 @@ fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv FATE_VP6 += fate-vp6f fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv -FATE_AVCONV += $(FATE_VP6) +FATE_SAMPLES_AVCONV += $(FATE_VP6) fate-vp6: $(FATE_VP6) VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 @@ -49,5 +49,5 @@ endef $(eval $(call FATE_VP8_FULL)) $(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge)) -FATE_AVCONV += $(FATE_VP8) +FATE_SAMPLES_AVCONV += $(FATE_VP8) fate-vp8: $(FATE_VP8) diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak index 72303667ad..18676351f6 100644 --- a/tests/fate/vqf.mak +++ b/tests/fate/vqf.mak @@ -1,7 +1,7 @@ -FATE_AVCONV += fate-twinvq +FATE_SAMPLES_AVCONV += fate-twinvq fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf fate-twinvq: CMP = oneoff fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm -FATE_AVCONV += fate-vqf-demux +FATE_SAMPLES_AVCONV += fate-vqf-demux fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index d70f713725..b615c9edd3 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -86,5 +86,5 @@ fate-wavpack-falsestereo: CMD = md5 -i $(SAMPLES)/wavpack/special/false_stereo.w FATE_WAVPACK += fate-wavpack-matroskamode fate-wavpack-matroskamode: CMD = md5 -i $(SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -FATE_AVCONV += $(FATE_WAVPACK) +FATE_SAMPLES_AVCONV += $(FATE_WAVPACK) fate-wavpack: $(FATE_WAVPACK) diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index 41b88ae2f1..ba52b3181f 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -13,7 +13,7 @@ fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn fate-wmapro-ism: CMP = oneoff fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm -FATE_AVCONV += $(FATE_WMAPRO) +FATE_SAMPLES_AVCONV += $(FATE_WMAPRO) fate-wmapro: $(FATE_WMAPRO) FATE_WMAVOICE += fate-wmavoice-7k @@ -34,7 +34,7 @@ fate-wmavoice-19k: CMP = stddev fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm fate-wmavoice-19k: FUZZ = 3 -FATE_AVCONV += $(FATE_WMAVOICE) +FATE_SAMPLES_AVCONV += $(FATE_WMAVOICE) fate-wmavoice: $(FATE_WMAVOICE) FATE_WMA_ENCODE += fate-wmav1-encode @@ -53,5 +53,5 @@ fate-wmav2-encode: CMP_SHIFT = -8192 fate-wmav2-encode: CMP_TARGET = 258.32 fate-wmav2-encode: SIZE_TOLERANCE = 4632 -FATE_AVCONV += $(FATE_WMA_ENCODE) +FATE_SAMPLES_AVCONV += $(FATE_WMA_ENCODE) fate-wma-encode: $(FATE_WMA_ENCODE) |