fate/all: fix missing some mov demuxer dependencies

In aac/aac-fixed, also remove unnecessary aac demuxer dependency.

Nicolas Gaullier committed 1 year ago

Commit 81b1cd31 parent 57a04124 files · +13 −13Browse files

Unified · Split

4 files

tests/fate/aac.mak +1 −1
tests/fate/h264.mak +1 −1
tests/fate/lavf-container.mak +4 −4
tests/fate/mov.mak +7 −7

@@ -244,7 +244,7 @@ fate-aac-autobsf-adtstoasc: CMD = transcode "aac" $(TARGET_SAMPLES)/audiomatch/t · 243 unmodified lines
244	244	FATE_AAC-$(call PCM, AAC, AAC, ARESAMPLE_FILTER) += $(FATE_AAC_CT_RAW)
245	245	FATE_AAC-$(call PCM, MOV, AAC, ARESAMPLE_FILTER) += $(FATE_AAC)
246	246	FATE_AAC_LATM-$(call PCM, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) += $(FATE_AAC_LATM)
247		−FATE_AAC-$(call PCM, AAC, AAC_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED)
	247	+FATE_AAC-$(call PCM, MOV, AAC_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED)
248	248
249	249	FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes)
250	250

tests/fate/h264.mak+1−1

@@ -233,7 +233,7 @@ FATE_H264-$(call FRAMECRC, MOV,, H264_MUXER H264_MP4TOANNEXB_BSF) += fate-h264-b · 232 unmodified lines
233	233	FATE_H264-$(call FRAMECRC, MOV H264, H264, H264_PARSER H264_MUXER H264_MP4TOANNEXB_BSF EXTRACT_EXTRADATA_BSF) += fate-h264_mp4toannexb_ticket5927 \
234	234	fate-h264_mp4toannexb_ticket5927_2
235	235
236		−FATE_H264-$(call FRAMECRC, H264,, H264_PARSER MOV_MUXER DTS2PTS_BSF) += fate-h264-bsf-dts2pts
	236	+FATE_H264-$(call FRAMECRC, MOV H264,, H264_PARSER MOV_MUXER DTS2PTS_BSF) += fate-h264-bsf-dts2pts
237	237
238	238	FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff
239	239	FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580

tests/fate/lavf-container.mak+4−4

@@ -71,11 +71,11 @@ fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1" · 70 unmodified lines
71	71	FATE_AVCONV += $(FATE_LAVF_CONTAINER)
72	72	fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER)
73	73
74		−FATE_LAVF_CONTAINER_FATE-$(call CRC, IVF, AV1, AV1_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += av1.mp4
	74	+FATE_LAVF_CONTAINER_FATE-$(call CRC, IVF MOV, AV1, AV1_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += av1.mp4
75	75	FATE_LAVF_CONTAINER_FATE-$(call CRC, IVF MATROSKA, AV1, AV1_PARSER EXTRACT_EXTRADATA_BSF MATROSKA_MUXER) += av1.mkv
76		−FATE_LAVF_CONTAINER_FATE-$(call CRC, EVC,, EVC_PARSER MP4_MUXER) += evc.mp4
77		−FATE_LAVF_CONTAINER_FATE-$(call CRC, H264,, H264_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += h264.mp4
78		−FATE_LAVF_CONTAINER_FATE-$(call CRC, HEVC,, HEVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += hevc.mp4
	76	+FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV EVC,, EVC_PARSER MP4_MUXER) += evc.mp4
	77	+FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV H264,, H264_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += h264.mp4
	78	+FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV HEVC,, HEVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += hevc.mp4
79	79	FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV,, MOV_MUXER) += mv_hevc.mov
80	80	FATE_LAVF_CONTAINER_FATE-$(call CRC, MATROSKA, VVC, VVC_PARSER SETTS_BSF MATROSKA_MUXER) += vvc.mkv
81	81	FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV, VVC, VVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += vvc.mp4

tests/fate/mov.mak+7−7

@@ -222,13 +222,13 @@ fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergra · 221 unmodified lines
222	222	fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/mov-channel-description -map [outFL] -map [outFR] -map [outFC] -map [outLFE] -map [outBL] -map [outBR] -map [outDL] -map [outDR] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0"
223	223
224	224	# Test PCM in mp4 and channel layout
225		−FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 WAV, PAN_FILTER) \
	225	+FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 MOV, WAV_DEMUXER PAN_FILTER) \
226	226	+= fate-mov-mp4-pcm
227	227	fate-mov-mp4-pcm: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-mp4-pcm
228	228	fate-mov-mp4-pcm: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/mov-mp4-pcm -map [mono] -map [stereo] -map [2.1] -map [5.1] -map [7.1] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0"
229	229
230	230	# Test floating sample format PCM in mp4 and unusual channel layout
231		−FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_F32LE, MP4 WAV, PAN_FILTER) \
	231	+FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_F32LE, MP4 MOV, WAV_DEMUXER PAN_FILTER) \
232	232	+= fate-mov-mp4-pcm-float
233	233	fate-mov-mp4-pcm-float: tests/data/asynth-44100-1.wav
234	234	fate-mov-mp4-pcm-float: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-af aresample,pan=FR+FL+FR\|c0=c0\|c1=c0\|c2=c0 -c:a pcm_f32le" "-map 0 -c copy -frames:a 0"
@@ -243,7 +243,7 @@ fate-mov-vfr: CMD = md5 -filter_complex testsrc=size=2x2:duration=1,setpts=N*N:s · 8 unmodified lines
243	243	fate-mov-vfr: CMP = oneline
244	244	fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d
245	245
246		−FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo
	246	+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo
247	247	fate-mov-mp4-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo
248	248	fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
249	249	fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \
@@ -252,7 +252,7 @@ fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ · 2 unmodified lines
252	252	-streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" \
253	253	"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
254	254
255		−FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4
	255	+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4
256	256	fate-mov-mp4-iamf-5_1_4: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4
257	257	fate-mov-mp4-iamf-5_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-10.wav
258	258	fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \
@@ -263,7 +263,7 @@ fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter · 4 unmodified lines
263	263	"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition"
264	264
265	265	# Test muxing an IAMF track alongside a video one, with video as the first track.
266		−FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4, MP4 WAV, FLAC_DECODER RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-first
	266	+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4, MP4 MOV, WAV_DEMUXER FLAC_DECODER RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-first
267	267	fate-mov-mp4-iamf-7_1_4-video-first: tests/data/asynth-44100-12.wav tests/data/vsynth1.yuv tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4-2 tests/data/streamgroups/mix_presentation-7_1_4
268	268	fate-mov-mp4-iamf-7_1_4-video-first: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav
269	269	fate-mov-mp4-iamf-7_1_4-video-first: SRC2 = $(TARGET_PATH)/tests/data/vsynth1.yuv
@@ -276,7 +276,7 @@ fate-mov-mp4-iamf-7_1_4-video-first: CMD = transcode wav $(SRC) mp4 "-auto_conve · 6 unmodified lines
276	276	"-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)"
277	277
278	278	# Test muxing an IAMF track alongside a video one, with video as the last track. Also, use stream ids as track ids.
279		−FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4, MP4 WAV, FLAC_DECODER RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-last
	279	+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4, MP4 MOV, WAV_DEMUXER FLAC_DECODER RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-7_1_4-video-last
280	280	fate-mov-mp4-iamf-7_1_4-video-last: tests/data/asynth-44100-12.wav tests/data/vsynth1.yuv tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4 tests/data/streamgroups/mix_presentation-7_1_4
281	281	fate-mov-mp4-iamf-7_1_4-video-last: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav
282	282	fate-mov-mp4-iamf-7_1_4-video-last: SRC2 = $(TARGET_PATH)/tests/data/vsynth1.yuv
@@ -288,7 +288,7 @@ fate-mov-mp4-iamf-7_1_4-video-last: CMD = transcode wav $(SRC) mp4 "-auto_conver · 5 unmodified lines
288	288	"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition:stream=index,id" \
289	289	"-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)"
290	290
291		−FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1
	291	+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1
292	292	fate-mov-mp4-iamf-ambisonic_1: tests/data/asynth-44100-4.wav tests/data/filtergraphs/iamf_ambisonic_1 tests/data/streamgroups/audio_element-ambisonic_1 tests/data/streamgroups/mix_presentation-ambisonic_1
293	293	fate-mov-mp4-iamf-ambisonic_1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav
294	294	fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \

fate/all: fix missing some mov demuxer dependencies

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code