diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 02:14:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 02:25:41 +0200 |
| commit | 61930bd0d7154b6f3f8c8d2398c056c20e921652 (patch) | |
| tree | 54108723e1482e5d20a152f7a46c67ea51441965 /tests/fate | |
| parent | 35894ebbf9bef18a31dbb90a8a8818fbdc85a184 (diff) | |
| parent | c8b4a3999bc7f3732a537cdec6475918a65d6e78 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
libxvid: Give more suitable names to libxvid-related files.
libxvid: Separate libxvid encoder from libxvid rate control code.
jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
fate: cosmetics: lowercase some comments
fate: Give more consistent names to some RealVideo/RealAudio tests.
lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
lavfi: add extended_data to AVFilterBuffer.
lavc: check that extended_data is properly set in avcodec_encode_audio2().
lavc: pad last audio frame with silence when needed.
samplefmt: add a function for filling a buffer with silence.
samplefmt: add a function for copying audio samples.
lavr: do not try to copy to uninitialized output audio data.
lavr: make avresample_read() with NULL output discard samples.
fate: split idroq audio and video into separate tests
fate: improve dependencies
fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
fate: split some combined tests into separate audio and video tests
fate: fix dependencies for probe tests
mips: intreadwrite: fix inline asm for gcc 4.8
mips: intreadwrite: remove unnecessary inline asm
...
Conflicts:
cmdutils.h
configure
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffplay.c
libavcodec/internal.h
libavcodec/jpeglsdec.c
libavcodec/libschroedingerdec.c
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.h
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/libavutil.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.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/ea-mad
tests/ref/fate/ea-tqi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
41 files changed, 101 insertions, 72 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 9236e95de5..48e45d6c3c 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -88,7 +88,8 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 -FATE_TESTS += $(FATE_AAC) $(FATE_AAC_ENCODE) +FATE_FFMPEG += $(FATE_AAC) $(FATE_AAC_ENCODE) fate-aac: $(FATE_AAC) $(FATE_AAC_ENCODE) + $(FATE_AAC): CMP = oneoff $(FATE_AAC): FUZZ = 2 diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index ca0704d08d..ed2ce12c0e 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -44,5 +44,5 @@ fate-eac3-encode: CMP_SHIFT = -1024 fate-eac3-encode: CMP_TARGET = 514.02 fate-eac3-encode: SIZE_TOLERANCE = 488 -FATE_TESTS += $(FATE_AC3) +FATE_AVCONV += $(FATE_AC3) fate-ac3: $(FATE_AC3) diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 5e41d6e18f..16fe69efc6 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -16,14 +16,17 @@ fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f s FATE_ADPCM += fate-adpcm-creative-8-4bit fate-adpcm-creative-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f s16le -FATE_ADPCM += fate-adpcm-ea-mad-ea-r1 -fate-adpcm-ea-mad-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad +FATE_ADPCM += fate-adpcm-ea-1 +fate-adpcm-ea-1: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn + +FATE_ADPCM += fate-adpcm-ea-2 +fate-adpcm-ea-2: CMD = framecrc -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -vn FATE_ADPCM += fate-adpcm-ea-maxis-xa fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -FATE_ADPCM += fate-adpcm-ea-tqi -fate-adpcm-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 +FATE_ADPCM += fate-adpcm-ea-r1 +fate-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -vn FATE_ADPCM += fate-adpcm-ima-dk3 fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le @@ -31,6 +34,12 @@ fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le FATE_ADPCM += fate-adpcm-ima-dk4 fate-adpcm-ima-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le +FATE_ADPCM += fate-adpcm-ima-ea-eacs +fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -vn + +FATE_ADPCM += fate-adpcm-ima-ea-sead +fate-adpcm-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -vn + FATE_ADPCM += fate-adpcm-ima_wav-stereo fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le @@ -38,10 +47,10 @@ FATE_ADPCM += fate-adpcm-psx-str-v3 fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn FATE_ADPCM += fate-adpcm-thp -fate-adpcm-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp +fate-adpcm-thp: CMD = framecrc -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -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_TESTS += $(FATE_ADPCM) +FATE_AVCONV += $(FATE_ADPCM) fate-adpcm: $(FATE_ADPCM) diff --git a/tests/fate/als.mak b/tests/fate/als.mak index 267403428e..b75dab4853 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_TESTS += $(FATE_ALS) +FATE_AVCONV += $(FATE_ALS) fate-als: $(FATE_ALS) diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak index 3545ba86fb..917b81a406 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_TESTS += $(FATE_AMRNB) +FATE_AVCONV += $(FATE_AMRNB) fate-amrnb: $(FATE_AMRNB) diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index 8fc7928995..112262940e 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_TESTS += $(FATE_AMRWB) +FATE_AVCONV += $(FATE_AMRWB) fate-amrwb: $(FATE_AMRWB) diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak index efb1727463..5e6bd95c3b 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_TESTS += $(FATE_ATRAC) +FATE_AVCONV += $(FATE_ATRAC) fate-atrac: $(FATE_ATRAC) diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 186ac6e4ba..772a7a9437 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -40,5 +40,5 @@ fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268 FATE_AUDIO += fate-ws_snd fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le -FATE_TESTS += $(FATE_AUDIO) +FATE_FFMPEG += $(FATE_AUDIO) fate-audio: $(FATE_AUDIO) diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak index 56b5059a33..4a01bb0e2a 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_TESTS += $(FATE_BMP) +FATE_AVCONV += $(FATE_BMP) fate-bmp: $(FATE_BMP) diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 3a46c5ce50..2cec5d2a59 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_TESTS += $(FATE_CDXL) +FATE_AVCONV += $(FATE_CDXL) fate-cdxl: $(FATE_CDXL) diff --git a/tests/fate/dct.mak b/tests/fate/dct.mak index 8f2ab7a8e0..d79cb9157d 100644 --- a/tests/fate/dct.mak +++ b/tests/fate/dct.mak @@ -1,4 +1,4 @@ -FATE_TESTS += fate-idct8x8 +FATE-yes += 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/demux.mak b/tests/fate/demux.mak index 5d3ad4491a..5512f844be 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -94,5 +94,5 @@ fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acode FATE_DEMUX += fate-xwma-demux fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy -FATE_TESTS += $(FATE_DEMUX) +FATE_FFMPEG += $(FATE_DEMUX) fate-demux: $(FATE_DEMUX) diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak index 6220c070ef..e83683959b 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_TESTS += $(FATE_DFA) +FATE_AVCONV += $(FATE_DFA) fate-dfa: $(FATE_DFA) diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak index a8b8b3d8ed..36a33db220 100644 --- a/tests/fate/dpcm.mak +++ b/tests/fate/dpcm.mak @@ -1,5 +1,5 @@ FATE_DPCM += fate-dpcm-idroq -fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq +fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -vn FATE_DPCM += fate-dpcm-sierra fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le @@ -7,5 +7,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_TESTS += $(FATE_DPCM) +FATE_AVCONV += $(FATE_DPCM) fate-dpcm: $(FATE_DPCM) diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak index 20d9404c88..b0636feffb 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -4,17 +4,20 @@ fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be9 FATE_EA += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -FATE_EA += fate-ea-dct -fate-ea-dct: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct - FATE_EA += fate-ea-tgq fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an -FATE_EA += fate-ea-tgv-ima-ea-eacs -fate-ea-tgv-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 +FATE_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-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an + +FATE_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-ima-ea-sead -fate-ea-tgv-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 +FATE_EA += fate-ea-tgv-2 +fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an -FATE_TESTS += $(FATE_EA) +FATE_FFMPEG += $(FATE_EA) fate-ea: $(FATE_EA) diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak index d4199384a4..d3889cc877 100644 --- a/tests/fate/fft.mak +++ b/tests/fate/fft.mak @@ -38,5 +38,5 @@ $(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_TESTS += $(FATE_FFT) $(FATE_FFT_FIXED) +FATE-$(CONFIG_FFT) += $(FATE_FFT) $(FATE_FFT_FIXED) fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 0765f66e43..113fc32158 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_TESTS += $(FATE_H264) +FATE_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 60c6cb26ef..7ded69fb7d 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_TESTS += $(FATE_IMAGE) +FATE_FFMPEG += $(FATE_IMAGE) fate-image: $(FATE_IMAGE) diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak index cf1625c114..fbffe4a89c 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_TESTS += $(FATE_INDEO) +FATE_AVCONV += $(FATE_INDEO) fate-indeo: $(FATE_INDEO) diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index ec4012ebb6..2aa9596cdd 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -1,8 +1,10 @@ -FATE_TESTS += fate-golomb +FATE_LIBAVCODEC += fate-golomb fate-golomb: libavcodec/golomb-test$(EXESUF) fate-golomb: CMD = run libavcodec/golomb-test fate-golomb: REF = /dev/null -FATE_TESTS += fate-iirfilter +FATE_LIBAVCODEC += fate-iirfilter fate-iirfilter: libavcodec/iirfilter-test$(EXESUF) fate-iirfilter: CMD = run libavcodec/iirfilter-test + +fate-libavcodec: $(FATE_LIBAVCODEC) diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index c12f31ead7..14e1e65814 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -16,6 +16,6 @@ fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta FATE_LOSSLESS_AUDIO += fate-lossless-wma fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le -FATE_TESTS += $(FATE_LOSSLESS_AUDIO) +FATE_FFMPEG += $(FATE_LOSSLESS_AUDIO) fate-lossless-audio: $(FATE_LOSSLESS_AUDIO) diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 9293b96b54..79fd9eb31d 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_TESTS += $(FATE_LOSSLESS_VIDEO) +FATE_FFMPEG += $(FATE_LOSSLESS_VIDEO) fate-lossless-video: $(FATE_LOSSLESS_VIDEO) diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak index 20153b7438..19c515c455 100644 --- a/tests/fate/mapchan.mak +++ b/tests/fate/mapchan.mak @@ -10,5 +10,5 @@ FATE_MAPCHAN += fate-mapchan-silent-mono fate-mapchan-silent-mono: tests/data/asynth-22050-1.wav fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.wav -map_channel -1 -map_channel 0.0.0 -f wav -FATE_TESTS += $(FATE_MAPCHAN) +FATE_FFMPEG += $(FATE_MAPCHAN) fate-mapchan: $(FATE_MAPCHAN) diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index c9b78f7e52..ba6aff71d6 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_TESTS += $(FATE_MICROSOFT) +FATE_FFMPEG += $(FATE_MICROSOFT) fate-microsoft: $(FATE_MICROSOFT) diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index 4c16cb84e0..26a77d0b9d 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_TESTS += $(FATE_MP3) +FATE_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 2b263ce6be..0a8a84054f 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_TESTS += $(FATE_MPC) +FATE_FFMPEG += $(FATE_MPC) fate-mpc: $(FATE_MPC) diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index 4b271346f6..d0acc23d4f 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -30,5 +30,5 @@ fate-dcinema-encode: tests/data/asynth-96000-6.wav 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_TESTS += $(FATE_PCM) +FATE_AVCONV += $(FATE_PCM) fate-pcm: $(FATE_PCM) diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak index 39068f2d74..ae32af9bb2 100644 --- a/tests/fate/probe.mak +++ b/tests/fate/probe.mak @@ -10,8 +10,9 @@ fate-probe-format-roundup1414: REF = format_name=mpeg FATE_PROBE_FORMAT += fate-probe-format-roundup2015 fate-probe-format-roundup2015: REF = format_name=dv -FATE_TESTS += $(FATE_PROBE_FORMAT) +FATE-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT) +$(FATE_PROBE_FORMAT): ffprobe$(EXESUF) $(FATE_PROBE_FORMAT): CMP = oneline fate-probe-format-%: CMD = probefmt $(SAMPLES)/probe-format/$(@:fate-probe-format-%=%) diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index d211d3f4ae..42828c8b2a 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_TESTS += $(FATE_PRORES) +FATE_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 0afa401d7c..12cdb60d3a 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_TESTS += $(FATE_QT) +FATE_FFMPEG += $(FATE_QT) fate-qt: $(FATE_QT) diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak index 0d1e3fcdfc..8e14c3c028 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_TESTS += $(FATE_QTRLE) +FATE_AVCONV += $(FATE_QTRLE) fate-qtrle: $(FATE_QTRLE) diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 939a6cb36f..710b90c741 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -1,5 +1,5 @@ -FATE_REAL += fate-real-14_4 -fate-real-14_4: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le +FATE_REAL += fate-ra-144 +fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le FATE_REAL += fate-ra-288 fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm @@ -18,8 +18,8 @@ fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f FATE_REAL += fate-rv30 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an -FATE_REAL += fate-real-rv40 -fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an +FATE_REAL += fate-rv40 +fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an FATE_SIPR += fate-sipr-5k0 fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm @@ -44,5 +44,5 @@ fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm FATE_REAL += $(FATE_SIPR) fate-sipr: $(FATE_SIPR) -FATE_TESTS += $(FATE_REAL) +FATE_FFMPEG += $(FATE_REAL) fate-real: $(FATE_REAL) diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 1cc519dff8..81f2398037 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_TESTS += $(FATE_SCREEN) +FATE_FFMPEG += $(FATE_SCREEN) fate-screen: $(FATE_SCREEN) diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 7cf6237b1e..81f631afd9 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_TESTS += $(FATE_UTVIDEO) +FATE_AVCONV += $(FATE_UTVIDEO) fate-utvideo: $(FATE_UTVIDEO) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index c790fd4e7c..c85bbbae53 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -133,6 +133,9 @@ fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an FATE_VIDEO += fate-kmvc fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 +FATE_VIDEO += fate-mdec +fate-mdec: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an + FATE_VIDEO += fate-mimic fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam @@ -145,6 +148,7 @@ fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI FATE_VIDEO += 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_VIDEO += fate-nuv fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an @@ -157,6 +161,9 @@ fate-r210: CMD = framecrc -i $(SAMPLES)/r210/r210.avi -pix_fmt rgb48le FATE_VIDEO += fate-rl2 fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an +FATE_VIDEO += fate-roqvideo +fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an + FATE_VIDEO += fate-smacker fate-smacker: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 @@ -169,6 +176,9 @@ fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi FATE_VIDEO += fate-sub-srt fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass +FATE_VIDEO += fate-thp +fate-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -an + FATE_VIDEO += fate-tiertex-seq fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 @@ -218,5 +228,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_TESTS += $(FATE_VIDEO) +FATE_FFMPEG += $(FATE_VIDEO) fate-video: $(FATE_VIDEO) diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index f8fa24b7b6..9d151dceba 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_TESTS += $(FATE_VOICE) +FATE_FFMPEG += $(FATE_VOICE) fate-voice: $(FATE_VOICE) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 5452b74af5..25a5d89796 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -75,6 +75,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_TESTS += $(FATE_VORBIS) +FATE_AVCONV += $(FATE_VORBIS) fate-vorbis: $(FATE_VORBIS) $(FATE_VORBIS): CMP = oneoff diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 87b11cc23f..e468735e21 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,25 +1,28 @@ -FATE_TESTS += fate-ea-vp60 +FATE_EA_VP6 += fate-ea-vp60 fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 -FATE_TESTS += fate-ea-vp61 +FATE_EA_VP6 += fate-ea-vp61 fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 +FATE_AVCONV += $(FATE_EA_VP6) +fate-ea-vp6: $(FATE_EA_VP6) + FATE_VP3 += fate-vp31 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_TESTS += $(FATE_VP3) +FATE_AVCONV += $(FATE_VP3) fate-vp3: $(FATE_VP3) -FATE_TESTS += fate-vp5 +FATE_AVCONV += fate-vp5 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an -FATE_TESTS += fate-vp6a +FATE_AVCONV += fate-vp6a fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv -FATE_TESTS += fate-vp6f +FATE_AVCONV += fate-vp6f fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 @@ -46,5 +49,5 @@ endef $(eval $(call FATE_VP8_FULL)) $(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge)) -FATE_TESTS += $(FATE_VP8) +FATE_AVCONV += $(FATE_VP8) fate-vp8: $(FATE_VP8) diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak index 04c531de0f..042c055fc1 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_TESTS += $(FATE_VQF) +FATE_FFMPEG += $(FATE_VQF) fate-vqf: $(FATE_VQF) diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index bf18954877..d70f713725 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -1,4 +1,4 @@ -# Lossless +# lossless FATE_WAVPACK += fate-wavpack-lossless-float fate-wavpack-lossless-float: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le @@ -18,7 +18,7 @@ fate-wavpack-lossless-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/24bit-part FATE_WAVPACK += fate-wavpack-lossless-32bit fate-wavpack-lossless-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -# Lossy +# lossy FATE_WAVPACK += fate-wavpack-lossy-float fate-wavpack-lossy-float: CMD = md5 -i $(SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le @@ -35,7 +35,7 @@ fate-wavpack-lossy-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f FATE_WAVPACK += fate-wavpack-lossy-32bit fate-wavpack-lossy-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -# Channel configurations +# channel configurations FATE_WAVPACK += fate-wavpack-channels-monofloat fate-wavpack-channels-monofloat: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le @@ -55,7 +55,7 @@ fate-wavpack-channels-6.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/eva_2.22 FATE_WAVPACK += fate-wavpack-channels-7.1 fate-wavpack-channels-7.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -# Speed modes +# speed modes FATE_WAVPACK += fate-wavpack-speed-default fate-wavpack-speed-default: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/default-partial.wv -f s16le @@ -69,7 +69,7 @@ fate-wavpack-speed-high: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/high-partia FATE_WAVPACK += fate-wavpack-speed-vhigh fate-wavpack-speed-vhigh: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/vhigh-partial.wv -f s16le -# Special Cases +# special cases FATE_WAVPACK += fate-wavpack-cuesheet fate-wavpack-cuesheet: CMD = md5 -i $(SAMPLES)/wavpack/special/cue_sheet.wv -f s16le @@ -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_TESTS += $(FATE_WAVPACK) +FATE_AVCONV += $(FATE_WAVPACK) fate-wavpack: $(FATE_WAVPACK) diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index 6fd4b38ca7..41b88ae2f1 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_TESTS += $(FATE_WMAPRO) +FATE_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_TESTS += $(FATE_WMAVOICE) +FATE_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_TESTS += $(FATE_WMA_ENCODE) +FATE_AVCONV += $(FATE_WMA_ENCODE) fate-wma-encode: $(FATE_WMA_ENCODE) |