ffmpeg | branch: master | Nicolas Gaullier <nicolas.gaullier@cji.paris> | Mon Jun 30 18:09:13 2025 +0200| [81b1cd3ce2f9fe8db9b1fdcd28a9bb9b1effc9da] | committer: Michael Niedermayer
fate/all: fix missing some mov demuxer dependencies In aac/aac-fixed, also remove unnecessary aac demuxer dependency. Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81b1cd3ce2f9fe8db9b1fdcd28a9bb9b1effc9da --- tests/fate/aac.mak | 2 +- tests/fate/h264.mak | 2 +- tests/fate/lavf-container.mak | 8 ++++---- tests/fate/mov.mak | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index be3499911b..8a7f1da567 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -244,7 +244,7 @@ fate-aac-autobsf-adtstoasc: CMD = transcode "aac" $(TARGET_SAMPLES)/audiomatch/t FATE_AAC-$(call PCM, AAC, AAC, ARESAMPLE_FILTER) += $(FATE_AAC_CT_RAW) FATE_AAC-$(call PCM, MOV, AAC, ARESAMPLE_FILTER) += $(FATE_AAC) FATE_AAC_LATM-$(call PCM, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) += $(FATE_AAC_LATM) -FATE_AAC-$(call PCM, AAC, AAC_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED) +FATE_AAC-$(call PCM, MOV, AAC_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED) FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 07dac269b4..c6339ec3b6 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -233,7 +233,7 @@ FATE_H264-$(call FRAMECRC, MOV,, H264_MUXER H264_MP4TOANNEXB_BSF) += fate-h264-b FATE_H264-$(call FRAMECRC, MOV H264, H264, H264_PARSER H264_MUXER H264_MP4TOANNEXB_BSF EXTRACT_EXTRADATA_BSF) += fate-h264_mp4toannexb_ticket5927 \ fate-h264_mp4toannexb_ticket5927_2 -FATE_H264-$(call FRAMECRC, H264,, H264_PARSER MOV_MUXER DTS2PTS_BSF) += fate-h264-bsf-dts2pts +FATE_H264-$(call FRAMECRC, MOV H264,, H264_PARSER MOV_MUXER DTS2PTS_BSF) += fate-h264-bsf-dts2pts FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580 diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 8e8d1d819d..e2a001a567 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -71,11 +71,11 @@ fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1" FATE_AVCONV += $(FATE_LAVF_CONTAINER) fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER) -FATE_LAVF_CONTAINER_FATE-$(call CRC, IVF, AV1, AV1_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += av1.mp4 +FATE_LAVF_CONTAINER_FATE-$(call CRC, IVF MOV, AV1, AV1_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += av1.mp4 FATE_LAVF_CONTAINER_FATE-$(call CRC, IVF MATROSKA, AV1, AV1_PARSER EXTRACT_EXTRADATA_BSF MATROSKA_MUXER) += av1.mkv -FATE_LAVF_CONTAINER_FATE-$(call CRC, EVC,, EVC_PARSER MP4_MUXER) += evc.mp4 -FATE_LAVF_CONTAINER_FATE-$(call CRC, H264,, H264_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += h264.mp4 -FATE_LAVF_CONTAINER_FATE-$(call CRC, HEVC,, HEVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += hevc.mp4 +FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV EVC,, EVC_PARSER MP4_MUXER) += evc.mp4 +FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV H264,, H264_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += h264.mp4 +FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV HEVC,, HEVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += hevc.mp4 FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV,, MOV_MUXER) += mv_hevc.mov FATE_LAVF_CONTAINER_FATE-$(call CRC, MATROSKA, VVC, VVC_PARSER SETTS_BSF MATROSKA_MUXER) += vvc.mkv FATE_LAVF_CONTAINER_FATE-$(call CRC, MOV, VVC, VVC_PARSER EXTRACT_EXTRADATA_BSF MP4_MUXER) += vvc.mp4 diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index c77415fe64..f69b74193d 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -222,13 +222,13 @@ fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergra 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" # Test PCM in mp4 and channel layout -FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 WAV, PAN_FILTER) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 MOV, WAV_DEMUXER PAN_FILTER) \ += fate-mov-mp4-pcm fate-mov-mp4-pcm: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-mp4-pcm 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" # Test floating sample format PCM in mp4 and unusual channel layout -FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_F32LE, MP4 WAV, PAN_FILTER) \ +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_F32LE, MP4 MOV, WAV_DEMUXER PAN_FILTER) \ += fate-mov-mp4-pcm-float fate-mov-mp4-pcm-float: tests/data/asynth-44100-1.wav 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 fate-mov-vfr: CMP = oneline fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo fate-mov-mp4-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ @@ -252,7 +252,7 @@ fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" \ "-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" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4 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 fate-mov-mp4-iamf-5_1_4: SRC = $(TARGET_PATH)/tests/data/asynth-44100-10.wav 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 "-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" # Test muxing an IAMF track alongside a video one, with video as the first track. -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 +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 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 fate-mov-mp4-iamf-7_1_4-video-first: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav 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 "-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)" # Test muxing an IAMF track alongside a video one, with video as the last track. Also, use stream ids as track ids. -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 +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 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 fate-mov-mp4-iamf-7_1_4-video-last: SRC = $(TARGET_PATH)/tests/data/asynth-44100-12.wav 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 "-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" \ "-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)" -FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1 +FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1 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 fate-mov-mp4-iamf-ambisonic_1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-4.wav fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
