diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 00:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 10:21:52 +0200 |
| commit | 31f3c94760b42e16e998dcc0b34e677d1aa431bc (patch) | |
| tree | 8a6033e5163bd038ea8ba5629233e7567e57d4ae | |
| parent | d1384c00d4882712816612d82289be240c508779 (diff) | |
| parent | 63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (diff) | |
| download | ffmpeg-31f3c94760b42e16e998dcc0b34e677d1aa431bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fix dependencies on SAMPLES being set
fate: remove unnecessary libavfilter dependency
Conflicts:
ffmpeg.c
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/probe.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/idroq-video-encode
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
38 files changed, 111 insertions, 106 deletions
diff --git a/tests/Makefile b/tests/Makefile index a724e06db5..f872a0aa41 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -92,14 +92,18 @@ FATE = $(FATE_ACODEC) \ $(FATE_SEEK) \ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) +FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI) +FATE_SAMPLES-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) +FATE_SAMPLES += $(FATE_SAMPLES-yes) + FATE += $(FATE-yes) FATE += $(FATE_LIBAVUTIL) -$(FATE_FFMPEG) $(FATE_LAVF_FATE): ffmpeg$(EXESUF) +$(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) $(filter-out %-aref,$(FATE_ACODEC)): $(AREF) $(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref @@ -126,8 +130,8 @@ fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_LAVF_FATE) -FATE += $(FATE_FFMPEG) FATE += $(FATE_FULL) $(FATE_FULL-yes) +FATE += $(FATE_SAMPLES) fate-rsync: rsync -vaLW --timeout=60 --contimeout=60 rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES) else @@ -135,8 +139,8 @@ fate:: @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified" 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 48e45d6c3c..314bc82c35 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -88,7 +88,7 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 -FATE_FFMPEG += $(FATE_AAC) $(FATE_AAC_ENCODE) +FATE_SAMPLES_FFMPEG += $(FATE_AAC) $(FATE_AAC_ENCODE) fate-aac: $(FATE_AAC) $(FATE_AAC_ENCODE) $(FATE_AAC): CMP = oneoff 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 19d2398dd7..33356da3c6 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -10,31 +10,31 @@ fate-binkaudio-rdft: CMP = oneoff fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm fate-binkaudio-rdft: FUZZ = 2 -FATE_AUDIO += $(FATE_BINKAUDIO) +FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO) fate-binkaudio: $(FATE_BINKAUDIO) -FATE_AUDIO += fate-bmv-audio +FATE_SAMPLES_AUDIO += fate-bmv-audio fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn -FATE_AUDIO += fate-delphine-cin-audio +FATE_SAMPLES_AUDIO += fate-delphine-cin-audio fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn -FATE_AUDIO += fate-dts +FATE_SAMPLES_AUDIO += fate-dts fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts fate-dts: CMP = oneoff fate-dts: REF = $(SAMPLES)/dts/dts.pcm -FATE_AUDIO += fate-imc +FATE_SAMPLES_AUDIO += fate-imc fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi fate-imc: CMP = oneoff fate-imc: REF = $(SAMPLES)/imc/imc.pcm -FATE_AUDIO += fate-nellymoser +FATE_SAMPLES_AUDIO += fate-nellymoser fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm -FATE_AUDIO += fate-nellymoser-aref-encode +FATE_SAMPLES_AUDIO += fate-nellymoser-aref-encode fate-nellymoser-aref-encode: $(AREF) fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser fate-nellymoser-aref-encode: CMP = stddev @@ -45,14 +45,14 @@ fate-nellymoser-aref-encode: CMP_SHIFT = -1172 fate-nellymoser-aref-encode: CMP_TARGET = 10216 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 1300 -FATE_AUDIO += fate-sierra-vmd-audio +FATE_SAMPLES_AUDIO += fate-sierra-vmd-audio fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn -FATE_AUDIO += fate-smacker-audio +FATE_SAMPLES_AUDIO += fate-smacker-audio fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn -FATE_AUDIO += fate-ws_snd +FATE_SAMPLES_AUDIO += fate-ws_snd fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le -FATE_FFMPEG += $(FATE_AUDIO) -fate-audio: $(FATE_AUDIO) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_AUDIO) +fate-audio: $(FATE_SAMPLES_AUDIO) 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 24f76a2cb0..cbb391bd74 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -1,77 +1,77 @@ -FATE_DEMUX += fate-avio-direct +FATE_SAMPLES_DEMUX += fate-avio-direct fate-avio-direct: CMD = framecrc -avioflags direct -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct -FATE_DEMUX += fate-adts-demux +FATE_SAMPLES_DEMUX += fate-adts-demux fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy -FATE_DEMUX += fate-aea-demux +FATE_SAMPLES_DEMUX += fate-aea-demux fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy -FATE_DEMUX += fate-bink-demux +FATE_SAMPLES_DEMUX += fate-bink-demux fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy -FATE_DEMUX += fate-caf +FATE_SAMPLES_DEMUX += fate-caf fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy -FATE_DEMUX += fate-cdxl-demux +FATE_SAMPLES_DEMUX += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy -FATE_DEMUX += fate-d-cinema-demux +FATE_SAMPLES_DEMUX += fate-d-cinema-demux fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -FATE_DEMUX += fate-iv8-demux +FATE_SAMPLES_DEMUX += fate-iv8-demux fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy -FATE_DEMUX += fate-lmlm4-demux +FATE_SAMPLES_DEMUX += fate-lmlm4-demux fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy -FATE_DEMUX += fate-maxis-xa +FATE_SAMPLES_DEMUX += fate-maxis-xa fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy -FATE_DEMUX += fate-mtv +FATE_SAMPLES_DEMUX += fate-mtv fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy -FATE_DEMUX += fate-mxf-demux +FATE_SAMPLES_DEMUX += fate-mxf-demux fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy -FATE_DEMUX += fate-nc-demux +FATE_SAMPLES_DEMUX += fate-nc-demux fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy -FATE_DEMUX += fate-nsv-demux +FATE_SAMPLES_DEMUX += fate-nsv-demux fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy -FATE_DEMUX += fate-oma-demux +FATE_SAMPLES_DEMUX += fate-oma-demux fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy -FATE_DEMUX += fate-psx-str-demux +FATE_SAMPLES_DEMUX += fate-psx-str-demux fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy -FATE_DEMUX += fate-pva-demux +FATE_SAMPLES_DEMUX += fate-pva-demux fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -FATE_DEMUX += fate-qcp-demux +FATE_SAMPLES_DEMUX += fate-qcp-demux fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy -FATE_DEMUX += fate-redcode-demux +FATE_SAMPLES_DEMUX += fate-redcode-demux fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy -FATE_DEMUX += fate-siff +FATE_SAMPLES_DEMUX += fate-siff fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -FATE_DEMUX += fate-smjpeg-demux +FATE_SAMPLES_DEMUX += fate-smjpeg-demux fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy -FATE_DEMUX += fate-westwood-aud +FATE_SAMPLES_DEMUX += fate-westwood-aud fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy -FATE_DEMUX += fate-wtv-demux +FATE_SAMPLES_DEMUX += fate-wtv-demux fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy -FATE_DEMUX += fate-xmv-demux +FATE_SAMPLES_DEMUX += fate-xmv-demux fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy -FATE_DEMUX += fate-xwma-demux +FATE_SAMPLES_DEMUX += fate-xwma-demux fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy -FATE_FFMPEG += $(FATE_DEMUX) -fate-demux: $(FATE_DEMUX) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX) +fate-demux: $(FATE_SAMPLES_DEMUX) 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 b0636feffb..2f7f2ad059 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -1,23 +1,23 @@ -FATE_EA += fate-ea-cdata +FATE_SAMPLES_EA += fate-ea-cdata fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le -FATE_EA += fate-ea-cmv +FATE_SAMPLES_EA += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -FATE_EA += fate-ea-tgq +FATE_SAMPLES_EA += fate-ea-tgq fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an -FATE_EA += fate-ea-tqi +FATE_SAMPLES_EA += fate-ea-tqi fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an -FATE_EA += fate-ea-mad +FATE_SAMPLES_EA += fate-ea-mad fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an -FATE_EA += fate-ea-tgv-1 +FATE_SAMPLES_EA += fate-ea-tgv-1 fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an -FATE_EA += fate-ea-tgv-2 +FATE_SAMPLES_EA += fate-ea-tgv-2 fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an -FATE_FFMPEG += $(FATE_EA) -fate-ea: $(FATE_EA) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA) +fate-ea: $(FATE_SAMPLES_EA) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 113fc32158..cd1e65f5a2 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -188,7 +188,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 -vsync drop -i $(SAMPLES)/h264-conformance/AUD_MW_E.264 diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 7ded69fb7d..5b89960de6 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -70,6 +70,6 @@ fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF FATE_IMAGE += $(FATE_TIFF) fate-tiff: $(FATE_TIFF) -FATE_FFMPEG += $(FATE_IMAGE) +FATE_SAMPLES_FFMPEG += $(FATE_IMAGE) fate-image: $(FATE_IMAGE) 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 14e1e65814..e87bb995ea 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -1,21 +1,21 @@ -FATE_LOSSLESS_AUDIO += fate-lossless-alac +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-alac fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le -FATE_LOSSLESS_AUDIO += fate-lossless-meridianaudio +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le -FATE_LOSSLESS_AUDIO += fate-lossless-monkeysaudio +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le -FATE_LOSSLESS_AUDIO += fate-lossless-shorten +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-shorten fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le -FATE_LOSSLESS_AUDIO += fate-lossless-tta +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta -FATE_LOSSLESS_AUDIO += fate-lossless-wma +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-wma fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le -FATE_FFMPEG += $(FATE_LOSSLESS_AUDIO) -fate-lossless-audio: $(FATE_LOSSLESS_AUDIO) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_LOSSLESS_AUDIO) +fate-lossless-audio: $(FATE_SAMPLES_LOSSLESS_AUDIO) diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 79fd9eb31d..d7d192db9a 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -22,6 +22,6 @@ fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi FATE_LOSSLESS_VIDEO += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi -FATE_FFMPEG += $(FATE_LOSSLESS_VIDEO) +FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO) fate-lossless-video: $(FATE_LOSSLESS_VIDEO) diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index ba6aff71d6..be26abf538 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -42,5 +42,5 @@ fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an FATE_MICROSOFT += $(FATE_VC1) fate-vc1: $(FATE_VC1) -FATE_FFMPEG += $(FATE_MICROSOFT) +FATE_SAMPLES_FFMPEG += $(FATE_MICROSOFT) fate-microsoft: $(FATE_MICROSOFT) 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 0a8a84054f..ae68ee2a06 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_FFMPEG += $(FATE_MPC) +FATE_SAMPLES_FFMPEG += $(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 c366be8962..f054d3a482 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_FULL-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT) +FATE_SAMPLES-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT) $(FATE_PROBE_FORMAT): ffprobe$(EXESUF) diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index 42828c8b2a..9f4d1b3ff2 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 -flags +bitexact -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 12cdb60d3a..c626245157 100644 --- a/tests/fate/qt.mak +++ b/tests/fate/qt.mak @@ -49,5 +49,5 @@ fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 FATE_QT += fate-svq3 fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an -FATE_FFMPEG += $(FATE_QT) +FATE_SAMPLES_FFMPEG += $(FATE_QT) fate-qt: $(FATE_QT) 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 710b90c741..aa3a5afee1 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -44,5 +44,5 @@ fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm FATE_REAL += $(FATE_SIPR) fate-sipr: $(FATE_SIPR) -FATE_FFMPEG += $(FATE_REAL) +FATE_SAMPLES_FFMPEG += $(FATE_REAL) fate-real: $(FATE_REAL) diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 81f2398037..eb7bafe9c3 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -59,5 +59,5 @@ fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 FATE_SCREEN += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) -FATE_FFMPEG += $(FATE_SCREEN) +FATE_SAMPLES_FFMPEG += $(FATE_SCREEN) fate-screen: $(FATE_SCREEN) 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 5c4ca66230..974cb8313e 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -246,5 +246,5 @@ fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an FATE_VIDEO += fate-xxan-wc4 fate-xxan-wc4: CMD = framecrc -i $(SAMPLES)/wc4-xan/wc4trailer-partial.avi -an -FATE_FFMPEG += $(FATE_VIDEO) +FATE_SAMPLES_FFMPEG += $(FATE_VIDEO) fate-video: $(FATE_VIDEO) diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index 9d151dceba..4082405dbb 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -51,5 +51,5 @@ fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav fate-truespeech: CMP = oneoff fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm -FATE_FFMPEG += $(FATE_VOICE) +FATE_SAMPLES_FFMPEG += $(FATE_VOICE) fate-voice: $(FATE_VOICE) 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 c66eb4624e..8168fb2b4a 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 042c055fc1..b8a91c1661 100644 --- a/tests/fate/vqf.mak +++ b/tests/fate/vqf.mak @@ -6,5 +6,5 @@ fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm FATE_VQF += fate-vqf-demux fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc -FATE_FFMPEG += $(FATE_VQF) +FATE_SAMPLES_FFMPEG += $(FATE_VQF) fate-vqf: $(FATE_VQF) 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) |