From 982070c113d70b4b97743c56ba9cd3e32c70169b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 9 Mar 2013 15:46:46 +0100 Subject: Add some fate dependencies to fix make fate with --disable-everything. --- tests/fate/audio.mak | 2 +- tests/fate/avformat.mak | 3 ++- tests/fate/cover-art.mak | 16 +++++++++------- tests/fate/demux.mak | 2 +- tests/fate/ffmpeg.mak | 10 ++++++---- tests/fate/pcm.mak | 24 ++++++++++++------------ tests/fate/probe.mak | 10 ++++++---- 7 files changed, 37 insertions(+), 30 deletions(-) (limited to 'tests') diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 3e5e313a86..65bb1461e6 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -34,7 +34,7 @@ fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm -FATE_SAMPLES_AUDIO += fate-nellymoser-aref-encode +FATE_SAMPLES_AUDIO-$(call ENCMUX, NELLYMOSER, FLV) += fate-nellymoser-aref-encode fate-nellymoser-aref-encode: $(AREF) ./tests/data/asynth-16000-1.wav fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser fate-nellymoser-aref-encode: CMP = stddev diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index 86fb071b80..5f9c8c1c26 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -52,7 +52,8 @@ FATE_LAVF-$(call ENCDEC, XWD, IMAGE2) += xwd FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%) -FATE_LAVF += fate-lavf-pixfmt +FATE_LAVF_PIXFMT-$(CONFIG_SCALE_FILTER) += fate-lavf-pixfmt +FATE_LAVF += $(FATE_LAVF_PIXFMT-yes) $(FATE_LAVF): $(AREF) $(VREF) $(FATE_LAVF): CMD = lavftest diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index 56a384e5fb..b175c3e88b 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -1,31 +1,33 @@ -FATE_COVER_ART += fate-cover-art-ape +FATE_COVER_ART-$(CONFIG_APE_DEMUXER) += fate-cover-art-ape fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317 -FATE_COVER_ART += fate-cover-art-flac +FATE_COVER_ART-$(CONFIG_FLAC_DEMUXER) += fate-cover-art-flac fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261 -FATE_COVER_ART += fate-cover-art-m4a +FATE_COVER_ART-$(CONFIG_MOV_DEMUXER) += fate-cover-art-m4a fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e -FATE_COVER_ART += fate-cover-art-wma +FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b -FATE_COVER_ART += fate-cover-art-wma-id3 +FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-id3 fate-cover-art-wma-id3: CMD = md5 -i $(SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo fate-cover-art-wma-id3: REF = e6a8dd03687d5178bc13fc7d3316696e -FATE_COVER_ART += fate-cover-art-wma-metadatalib +FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-metadatalib fate-cover-art-wma-metadatalib: CMD = md5 -i $(SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo fate-cover-art-wma-metadatalib: REF = 32e8bd4fad546f63d881a0256f083aea -FATE_COVER_ART += fate-cover-art-wv +FATE_COVER_ART-$(CONFIG_WV_DEMUXER) += fate-cover-art-wv fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317 +FATE_COVER_ART = $(FATE_COVER_ART-yes) + $(FATE_COVER_ART): CMP = oneline FATE_SAMPLES_AVCONV += $(FATE_COVER_ART) fate-cover-art: $(FATE_COVER_ART) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 189ef27287..3b5f954735 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -1,4 +1,4 @@ -FATE_SAMPLES_DEMUX += fate-avio-direct +FATE_SAMPLES_DEMUX-$(call DEMDEC, AVI, FRAPS) += fate-avio-direct fate-avio-direct: CMD = framecrc -avioflags direct -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct FATE_SAMPLES_DEMUX-$(CONFIG_AAC_DEMUXER) += fate-adts-demux diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index b98ccd8c77..cc0e22add3 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -1,19 +1,21 @@ -FATE_MAPCHAN += fate-mapchan-6ch-extract-2 +FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-6ch-extract-2 fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav fate-mapchan-6ch-extract-2: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -flags +bitexact -f wav md5: -map_channel 0.0.1 -flags +bitexact -f wav md5: -FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono +FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-6ch-extract-2-downmix-mono fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -flags +bitexact -f wav -FATE_MAPCHAN += fate-mapchan-silent-mono +FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += 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 -flags +bitexact -f wav +FATE_MAPCHAN = $(FATE_MAPCHAN-yes) + FATE_FFMPEG += $(FATE_MAPCHAN) fate-mapchan: $(FATE_MAPCHAN) -FATE_FFMPEG += fate-force_key_frames +FATE_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames fate-force_key_frames: tests/data/vsynth2.yuv fate-force_key_frames: CMD = enc_dec \ "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \ diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index e978719dd3..4a3822f181 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -1,32 +1,32 @@ -FATE_SAMPLES_PCM += fate-iff-pcm +FATE_SAMPLES_PCM-$(call DEMDEC, WAV, PCM_U8) += fate-iff-pcm fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le -FATE_SAMPLES_PCM += fate-pcm_dvd +FATE_SAMPLES_PCM-$(call DEMDEC, MPEGPS, PCM_DVD) += fate-pcm_dvd fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn -FATE_SAMPLES_PCM += fate-pcm-planar +FATE_SAMPLES_PCM-$(call DEMDEC, EA, PCM_S16LE_PLANAR) += fate-pcm-planar fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn -FATE_SAMPLES_PCM += fate-pcm_s16be-stereo +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16BE) += fate-pcm_s16be-stereo fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le -FATE_SAMPLES_PCM += fate-pcm_s16le-stereo +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16LE) += fate-pcm_s16le-stereo fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le -FATE_SAMPLES_PCM += fate-pcm_u8-mono +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += fate-pcm_u8-mono fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le -FATE_SAMPLES_PCM += fate-pcm_u8-stereo +FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += fate-pcm_u8-stereo fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le -FATE_SAMPLES_PCM += fate-w64 +FATE_SAMPLES_PCM-$(call DEMDEC, W64, PCM_S16LE) += fate-w64 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64 -FATE_PCM += fate-dcinema-encode +FATE_PCM-$(call ENCMUX, PCM_S24DAUD, DAUD) += fate-dcinema-encode 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_FFMPEG += $(FATE_PCM) -FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM) -fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM) +FATE_FFMPEG += $(FATE_PCM-yes) +FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes) +fate-pcm: $(FATE_PCM-yes) $(FATE_SAMPLES_PCM-yes) diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak index 033b484ae0..1166de4af4 100644 --- a/tests/fate/probe.mak +++ b/tests/fate/probe.mak @@ -1,15 +1,17 @@ -FATE_PROBE_FORMAT += fate-probe-format-roundup997 +FATE_PROBE_FORMAT-$(CONFIG_MPEGPS_DEMUXER) += fate-probe-format-roundup997 fate-probe-format-roundup997: REF = mpeg -FATE_PROBE_FORMAT += fate-probe-format-roundup1383 +FATE_PROBE_FORMAT-$(CONFIG_MP3_DEMUXER) += fate-probe-format-roundup1383 fate-probe-format-roundup1383: REF = mp3 -FATE_PROBE_FORMAT += fate-probe-format-roundup1414 +FATE_PROBE_FORMAT-$(CONFIG_MPEGPS_DEMUXER) += fate-probe-format-roundup1414 fate-probe-format-roundup1414: REF = mpeg -FATE_PROBE_FORMAT += fate-probe-format-roundup2015 +FATE_PROBE_FORMAT-$(CONFIG_DV_DEMUXER) += fate-probe-format-roundup2015 fate-probe-format-roundup2015: REF = dv +FATE_PROBE_FORMAT = $(FATE_PROBE_FORMAT-yes) + FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT) -- cgit v1.2.3