Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris>
---
tests/fate/enc_external.mak | 6 +++---
tests/fate/lavf-container.mak | 12 ++++++------
tests/fate/mov.mak | 14 +++++++-------
tests/fate/subtitles.mak | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/fate/enc_external.mak b/tests/fate/enc_external.mak
index 4095a4b51a..705f733db7 100644
--- a/tests/fate/enc_external.mak
+++ b/tests/fate/enc_external.mak
@@ -1,14 +1,14 @@
-FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 H264, MOV, H264_DEMUXER) +=
fate-libx264-simple
+FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 H264, MP4 MOV, H264_DEMUXER) +=
fate-libx264-simple
fate-libx264-simple: CMD = enc_external
$(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv \
mp4 "-c:v libx264" "-show_entries frame=width,height,pix_fmt,pts,pkt_dts
-of flat"
# test for SVT-AV1 MDCV and CLL passthrough during encoding
-FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MOV, HEVC_DEMUXER
LIBDAV1D_DECODER) += fate-libsvtav1-hdr10
+FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MP4 MOV, HEVC_DEMUXER
LIBDAV1D_DECODER) += fate-libsvtav1-hdr10
fate-libsvtav1-hdr10: CMD = enc_external
$(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \
mp4 "-c:v libsvtav1" "-show_frames -show_entries frame=side_data_list -of
flat"
# test for x264 MDCV and CLL passthrough during encoding
-FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MOV, LIBX264_HDR10 HEVC_DEMUXER
H264_DECODER) += fate-libx264-hdr10
+FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MP4 MOV, LIBX264_HDR10
HEVC_DEMUXER H264_DECODER) += fate-libx264-hdr10
fate-libx264-hdr10: CMD = enc_external
$(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \
mp4 "-c:v libx264" "-show_frames -show_entries frame=side_data_list -of
flat"
diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
index 89181dee42..db8c315d08 100644
--- a/tests/fate/lavf-container.mak
+++ b/tests/fate/lavf-container.mak
@@ -6,7 +6,7 @@ FATE_LAVF_CONTAINER-$(call ENCDEC, RAWVIDEO,
FILMSTRIP) +
FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)
+= gxf gxf_pal gxf_ntsc
FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA)
+= mkv mkv_attachment
FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV)
+= mov mov_rtphint mov_hybrid_frag ismv
-FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MOV)
+= mp4
+FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MP4 MOV)
+= mp4
FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS)
+= mpg
FATE_LAVF_CONTAINER-$(call ENCDEC , FFV1, MXF)
+= mxf_ffv1
FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)
+= mxf
@@ -71,13 +71,13 @@ 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 ALLYES, IVF_DEMUXER AV1_DECODER AV1_PARSER
EXTRACT_EXTRADATA_BSF MOV_MUXER) += av1.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_DECODER AV1_PARSER
EXTRACT_EXTRADATA_BSF MP4_MUXER) += av1.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_DECODER AV1_PARSER
EXTRACT_EXTRADATA_BSF MATROSKA_MUXER) += av1.mkv
-FATE_LAVF_CONTAINER_FATE-$(call ALLYES, EVC_DEMUXER EVC_PARSER MOV_MUXER)
+= evc.mp4
-FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER
EXTRACT_EXTRADATA_BSF MOV_MUXER) += h264.mp4
-FATE_LAVF_CONTAINER_FATE-$(call ALLYES, HEVC_DEMUXER HEVC_PARSER
EXTRACT_EXTRADATA_BSF MOV_MUXER) += hevc.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, EVC_DEMUXER EVC_PARSER MP4_MUXER)
+= evc.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER
EXTRACT_EXTRADATA_BSF MP4_MUXER) += h264.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, HEVC_DEMUXER HEVC_PARSER
EXTRACT_EXTRADATA_BSF MP4_MUXER) += hevc.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER)
+= mv_hevc.mov
-FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER
EXTRACT_EXTRADATA_BSF MOV_MUXER) += vvc.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER
EXTRACT_EXTRADATA_BSF MP4_MUXER) += vvc.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER)
+= vp3.ogg
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER)
+= vp8.ogg
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER)
+= latm
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index ca13ebfd44..68b1e4f30b 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -208,13 +208,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, MOV, WAV_DEMUXER PAN_FILTER) \
+FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 WAV, 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_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \
+FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MP4 WAV, 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"
@@ -229,7 +229,7 @@ fate-mov-vfr: CMD = md5 -filter_complex
testsrc=size=2x2:duration=1,setpts=N*N -
fate-mov-vfr: CMP = oneline
fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d
-FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER
PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo
+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, 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 " \
@@ -238,7 +238,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, MOV, WAV_DEMUXER
PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-5_1_4
+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, 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 \
@@ -249,7 +249,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 FLAC, MOV, WAV_DEMUXER
RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) +=
fate-mov-mp4-iamf-7_1_4-video-first
+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4 FLAC, MP4 WAV,
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
@@ -262,7 +262,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 FLAC, MOV, WAV_DEMUXER
RAWVIDEO_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) +=
fate-mov-mp4-iamf-7_1_4-video-last
+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, MPEG4 FLAC, MP4 WAV,
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
@@ -274,7 +274,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, MOV, WAV_DEMUXER
PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-mov-mp4-iamf-ambisonic_1
+FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MP4 WAV, 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 \
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
index 90412e9ac1..06c8ecdc92 100644
--- a/tests/fate/subtitles.mak
+++ b/tests/fate/subtitles.mak
@@ -38,7 +38,7 @@ fate-sub-microdvd-remux: CMD = fmtstdout microdvd -i
$(TARGET_SAMPLES)/sub/Micro
FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext
fate-sub-movtext: CMD = fmtstdout ass -i
$(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4
-FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc
+FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MP4 MOV) += fate-binsub-movtextenc
fate-binsub-movtextenc: CMD = md5 -i
$(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f
mp4 -flags +bitexact -fflags +bitexact -movflags +frag_keyframe+empty_moov
FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
--
2.30.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
