tests/Makefile: Redo how to keep intermediate FATE-files

Extend the ordinary mechanism to signal KEEP for this. This also allows to remove the keep-parameter from enc_dec, transcode and stream_remux, so that several empty parameters '""' could be removed.

Andreas Rheinhardt committed 4 years ago

Commit 95cbd971 parent 80c725815 files · +55 −43Browse files

Unified · Split

15 files

tests/Makefile +13 −1
tests/fate-run.sh +10 −10
tests/fate/acodec.mak +1 −1
tests/fate/caf.mak +1 −1
tests/fate/cover-art.mak +3 −3
tests/fate/ffmpeg.mak +2 −2
tests/fate/filter-video.mak +2 −2
tests/fate/id3v2.mak +2 −2
tests/fate/image.mak +2 −2
tests/fate/matroska.mak +10 −10
tests/fate/mov.mak +5 −5
tests/fate/mxf.mak +1 −1
tests/fate/oma.mak +1 −1
tests/fate/seek.mak +1 −1
tests/fate/vcodec.mak +1 −1

tests/Makefile+13−1

@@ -1,4 +1,16 @@
1		1
		2	ifneq ($(strip $(KEEP)),)
		3	ifneq ($(strip $(KEEP)),0)
		4	# KEEP_FILES is normally undefined; it is set to 2 # if the user requested
		5	# to keep all intermediate FATE-files by setting KEEP.
		6	# For some tests it is also set to 1 if it is unset; this indicates
		7	# that only some intermediate files (namely only non-raw files)
		8	# are to be kept. This allows reusing these intermediate files as input
		9	# files for other tests (mostly the seek-tests).
		10	KEEP_FILES = 2
		11	endif
		12	endif
		13
2	THREADS = 1	14	THREADS = 1
3	VREF = tests/vsynth1/00.pgm	15	VREF = tests/vsynth1/00.pgm
4	AREF = tests/data/asynth1.sw	16	AREF = tests/data/asynth1.sw
@@ -279,7 +291,7 @@ $(FATE): export EXECSUF = $(EXESUF) · 274 unmodified lines
279	$(FATE): export HOSTEXECSUF = $(HOSTEXESUF)	291	$(FATE): export HOSTEXECSUF = $(HOSTEXESUF)
280	$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) \| $(FATE_OUTDIRS)	292	$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) \| $(FATE_OUTDIRS)
281	@echo "TEST $(@:fate-%=%)"	293	@echo "TEST $(@:fate-%=%)"
282	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)'	294	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP_FILES)'
283		295
284	fate-list:	296	fate-list:
285	@printf '%s\n' $(sort $(FATE))	297	@printf '%s\n' $(sort $(FATE))

tests/fate-run.sh+10−10

@@ -205,11 +205,11 @@ enc_dec(){ · 204 unmodified lines
205	enc_opt=$4	205	enc_opt=$4
206	dec_fmt=$5	206	dec_fmt=$5
207	dec_opt=$6	207	dec_opt=$6
208	ffprobe_opts=$9	208	ffprobe_opts=$8
209	encfile="${outdir}/${test}.${enc_fmt}"	209	encfile="${outdir}/${test}.${enc_fmt}"
210	decfile="${outdir}/${test}.out.${dec_fmt}"	210	decfile="${outdir}/${test}.out.${dec_fmt}"
211	cleanfiles="$cleanfiles $decfile"	211	cleanfiles="$cleanfiles $decfile"
212	test "$7" = -keep \|\| cleanfiles="$cleanfiles $encfile"	212	test "$keep" -ge 1 \|\| cleanfiles="$cleanfiles $encfile"
213	tsrcfile=$(target_path $srcfile)	213	tsrcfile=$(target_path $srcfile)
214	tencfile=$(target_path $encfile)	214	tencfile=$(target_path $encfile)
215	tdecfile=$(target_path $decfile)	215	tdecfile=$(target_path $decfile)
@@ -217,7 +217,7 @@ enc_dec(){ · 1 unmodified line
217	-f $enc_fmt -y $tencfile \|\| return	217	-f $enc_fmt -y $tencfile \|\| return
218	do_md5sum $encfile	218	do_md5sum $encfile
219	echo $(wc -c $encfile)	219	echo $(wc -c $encfile)
220	ffmpeg -auto_conversion_filters $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \	220	ffmpeg -auto_conversion_filters $7 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
221	-f $dec_fmt -y $tdecfile \|\| return	221	-f $dec_fmt -y $tdecfile \|\| return
222	do_md5sum $decfile	222	do_md5sum $decfile
223	tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift	223	tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift
@@ -231,12 +231,12 @@ transcode(){ · 7 unmodified lines
231	enc_fmt=$3	231	enc_fmt=$3
232	enc_opt=$4	232	enc_opt=$4
233	final_encode=$5	233	final_encode=$5
234	ffprobe_opts=$7	234	ffprobe_opts=$6
235	additional_input=$8	235	additional_input=$7
236	final_decode=$9	236	final_decode=$8
237	test -z "$additional_input" \|\| additional_input="$DEC_OPTS $additional_input"	237	test -z "$additional_input" \|\| additional_input="$DEC_OPTS $additional_input"
238	encfile="${outdir}/${test}.${enc_fmt}"	238	encfile="${outdir}/${test}.${enc_fmt}"
239	test "$6" = -keep \|\| cleanfiles="$cleanfiles $encfile"	239	test $keep -ge 1 \|\| cleanfiles="$cleanfiles $encfile"
240	tsrcfile=$(target_path $srcfile)	240	tsrcfile=$(target_path $srcfile)
241	tencfile=$(target_path $encfile)	241	tencfile=$(target_path $encfile)
242	ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_input \	242	ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_input \
@@ -255,9 +255,9 @@ stream_remux(){ · 12 unmodified lines
255	enc_fmt=$3	255	enc_fmt=$3
256	stream_maps=$4	256	stream_maps=$4
257	final_decode=$5	257	final_decode=$5
258	ffprobe_opts=$7	258	ffprobe_opts=$6
259	encfile="${outdir}/${test}.${enc_fmt}"	259	encfile="${outdir}/${test}.${enc_fmt}"
260	test "$6" = -keep \|\| cleanfiles="$cleanfiles $encfile"	260	test $keep -ge 1 \|\| cleanfiles="$cleanfiles $encfile"
261	tsrcfile=$(target_path $srcfile)	261	tsrcfile=$(target_path $srcfile)
262	tencfile=$(target_path $encfile)	262	tencfile=$(target_path $encfile)
263	ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \	263	ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \
@@ -598,7 +598,7 @@ if test $err != 0 && test $gen != "no" ; then · 334 unmodified lines
598	fi	598	fi
599		599
600	if test $err = 0; then	600	if test $err = 0; then
601	if test $keep = 0; then	601	if test $keep -lt 2; then
602	rm -f $outfile $errfile $cmpfile $cleanfiles	602	rm -f $outfile $errfile $cmpfile $cleanfiles
603	fi	603	fi
604	elif test $gen = "no"; then	604	elif test $gen = "no"; then

tests/fate/acodec.mak+1−1

@@ -1,6 +1,6 @@
1	fate-acodec-%: CODEC = $(@:fate-acodec-%=%)	1	fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
2	fate-acodec-%: SRC = tests/data/asynth-44100-2.wav	2	fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
3	fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" "$(KEEP_OVERRIDE)"	3	fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)"
4	fate-acodec-%: CMP_UNIT = 2	4	fate-acodec-%: CMP_UNIT = 2
5	fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%)	5	fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%)
6		6

tests/fate/caf.mak+1−1

@@ -2,7 +2,7 @@ FATE_CAF_FFMPEG-$(call ALLYES, CAF_DEMUXER CRC_MUXER) += fate-caf-demux · 1 unmodified line
2	fate-caf-demux: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy	2	fate-caf-demux: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy
3		3
4	FATE_CAF_FFMPEG_FFPROBE-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-alac-remux	4	FATE_CAF_FFMPEG_FFPROBE-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-alac-remux
5	fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "" "-show_entries format_tags"	5	fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "-show_entries format_tags"
6		6
7	FATE_CAF_FFMPEG-$(call REMUX, CAF, AMR_DEMUXER) += fate-caf-amr_nb-remux	7	FATE_CAF_FFMPEG-$(call REMUX, CAF, AMR_DEMUXER) += fate-caf-amr_nb-remux
8	fate-caf-amr_nb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/4.75k.amr caf "-c copy" "-c copy -t 0.2"	8	fate-caf-amr_nb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/4.75k.amr caf "-c copy" "-c copy -t 0.2"

tests/fate/cover-art.mak+3−3

tests/fate/ffmpeg.mak+2−2

@@ -46,13 +46,13 @@ fate-force_key_frames: tests/data/vsynth_lena.yuv · 45 unmodified lines
46	fate-force_key_frames: CMD = enc_dec \	46	fate-force_key_frames: CMD = enc_dec \
47	"rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth_lena.yuv \	47	"rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth_lena.yuv \
48	avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \	48	avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
49	framecrc "" "" "-skip_frame nokey"	49	framecrc "" "-skip_frame nokey"
50		50
51	# Tests that the video is properly autorotated using the contained	51	# Tests that the video is properly autorotated using the contained
52	# display matrix and that the generated file does not contain	52	# display matrix and that the generated file does not contain
53	# a display matrix any more.	53	# a display matrix any more.
54	FATE_SAMPLES_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER MPEG2VIDEO_ENCODER AC3_FIXED_ENCODER MOV_MUXER MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF PIPE_PROTOCOL FRAMECRC_MUXER) += fate-autorotate	54	FATE_SAMPLES_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER MPEG2VIDEO_ENCODER AC3_FIXED_ENCODER MOV_MUXER MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF PIPE_PROTOCOL FRAMECRC_MUXER) += fate-autorotate
55	fate-autorotate: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c:v mpeg2video -c:a ac3_fixed" "-c copy -t 0.5" "" "-show_entries stream_side_data_list"	55	fate-autorotate: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c:v mpeg2video -c:a ac3_fixed" "-c copy -t 0.5" "-show_entries stream_side_data_list"
56		56
57	FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video	57	FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video
58	fate-sub2video: tests/data/vsynth_lena.yuv	58	fate-sub2video: tests/data/vsynth_lena.yuv

tests/fate/filter-video.mak+2−2

@@ -584,7 +584,7 @@ fate-filter-pad: CMD = video_filter "pad=iw1.5:ih1.5:iw0.3:ih0.2" · 583 unmodified lines
584	FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6	584	FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6
585	FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP)	585	FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP)
586	$(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd	586	$(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd
587	fate-vsynth1-mpeg4-qprd: KEEP_OVERRIDE= -keep	587	fate-vsynth1-mpeg4-qprd: KEEP_FILES ?= 1
588		588
589	fate-filter-pp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al"	589	fate-filter-pp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al"
590	fate-filter-pp1: CMD = video_filter "pp=fq\|4/be/hb/vb/tn/l5/al"	590	fate-filter-pp1: CMD = video_filter "pp=fq\|4/be/hb/vb/tn/l5/al"
@@ -857,7 +857,7 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filt · 266 unmodified lines
857	fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"	857	fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"
858		858
859	FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0	859	FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0
860	fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "" "-flags +bitexact -c:a aac_fixed"	860	fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
861		861
862	REFCMP_DEPS = FFMPEG LAVFI_INDEV TESTSRC2_FILTER AVGBLUR_FILTER METADATA_FILTER	862	REFCMP_DEPS = FFMPEG LAVFI_INDEV TESTSRC2_FILTER AVGBLUR_FILTER METADATA_FILTER
863		863

tests/fate/id3v2.mak+2−2

@@ -2,10 +2,10 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv · 1 unmodified line
2	fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3	2	fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3
3		3
4	FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux	4	FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux
5	fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "" "-show_entries format_tags"	5	fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "-show_entries format_tags"
6		6
7	FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters	7	FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters
8	fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "" "-show_entries format_tags:chapters"	8	fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "-show_entries format_tags:chapters"
9		9
10	FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes)	10	FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes)
11	FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes)	11	FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes)

tests/fate/image.mak+2−2

@@ -338,7 +338,7 @@ FATE_JPG += fate-jpg-jfif · 337 unmodified lines
338	fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg	338	fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg
339		339
340	FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc	340	FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc
341	fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames"	341	fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "-show_frames"
342		342
343	FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG)	343	FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG)
344	FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes)	344	FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes)
@@ -390,7 +390,7 @@ fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ · 45 unmodified lines
390	-i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png	390	-i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png
391		391
392	FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc	392	FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc
393	fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "" "-show_frames"	393	fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "-show_frames"
394		394
395	FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)	395	FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)
396	FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE)	396	FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE)

tests/fate/matroska.mak+10−10

tests/fate/mov.mak+5−5

tests/fate/mxf.mak+1−1

@@ -46,7 +46,7 @@ fate-mxf-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf · 45 unmodified lines
46	fate-mxf-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -fflags +bitexact -f mxf	46	fate-mxf-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -fflags +bitexact -f mxf
47		47
48	FATE_MXF_D10_USER_COMMENTS-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER DVVIDEO_DECODER SCALE_FILTER MPEG2VIDEO_ENCODER MXF_D10_MUXER EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER PIPE_PROTOCOL FRAMECRC_MUXER) += fate-mxf-d10-user-comments	48	FATE_MXF_D10_USER_COMMENTS-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER DVVIDEO_DECODER SCALE_FILTER MPEG2VIDEO_ENCODER MXF_D10_MUXER EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER PIPE_PROTOCOL FRAMECRC_MUXER) += fate-mxf-d10-user-comments
49	fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -metadata company_name=FATE-company -metadata product_name=FATE-test -metadata product_version=3.14159 -store_user_comments 1" "-c copy -frames:v 5" "" "-show_entries format_tags"	49	fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -metadata company_name=FATE-company -metadata product_name=FATE-test -metadata product_version=3.14159 -store_user_comments 1" "-c copy -frames:v 5" "-show_entries format_tags"
50		50
51	FATE_MXF_OPATOM_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-opatom-user-comments	51	FATE_MXF_OPATOM_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-opatom-user-comments
52	fate-mxf-opatom-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf	52	fate-mxf-opatom-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf

tests/fate/oma.mak+1−1

@@ -3,7 +3,7 @@ fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma -c:a · 2 unmodified lines
3		3
4	# Also tests splitting and joining the date into TYER and TDAT id3v2.3 tags.	4	# Also tests splitting and joining the date into TYER and TDAT id3v2.3 tags.
5	FATE_OMA_REMUX_FFPROBE-yes += fate-oma-atrac3p-remux	5	FATE_OMA_REMUX_FFPROBE-yes += fate-oma-atrac3p-remux
6	fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sample1.oma oma "-c copy -metadata date=2021-09-23 -metadata time=16:00 -metadata title=noise -metadata id3v2_priv.foo=hex\xB3 -metadata_header_padding 500" "-c copy -t 0.2" "" "-show_entries format_tags"	6	fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sample1.oma oma "-c copy -metadata date=2021-09-23 -metadata time=16:00 -metadata title=noise -metadata id3v2_priv.foo=hex\xB3 -metadata_header_padding 500" "-c copy -t 0.2" "-show_entries format_tags"
7		7
8	FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux	8	FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux
9	fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1"	9	fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1"

tests/fate/seek.mak+1−1

@@ -202,7 +202,7 @@ FATE_SEEK_EXTRA += $(FATE_SEEK_EXTRA-yes) · 201 unmodified lines
202	$(FATE_SEEK) $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA): libavformat/tests/seek$(EXESUF)	202	$(FATE_SEEK) $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA): libavformat/tests/seek$(EXESUF)
203	$(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)	203	$(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)
204	$(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-%	204	$(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-%
205	$(subst fate-seek-,fate-,$(FATE_SAMPLES_SEEK) $(FATE_SEEK)): KEEP_OVERRIDE = -keep	205	$(subst fate-seek-,fate-,$(FATE_SAMPLES_SEEK) $(FATE_SEEK)): KEEP_FILES ?= 1
206	fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%)	206	fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%)
207		207
208	FATE_AVCONV += $(FATE_SEEK)	208	FATE_AVCONV += $(FATE_SEEK)

tests/fate/vcodec.mak+1−1

@@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) · 5 unmodified lines
6	fate-vsynth%: FMT = avi	6	fate-vsynth%: FMT = avi
7	fate-vsynth%: DEFAULT_SIZE = -s 352x288	7	fate-vsynth%: DEFAULT_SIZE = -s 352x288
8	fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH)	8	fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH)
9	fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)"	9	fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(DECINOPTS)"
10	fate-vsynth%: CMP_UNIT = 1	10	fate-vsynth%: CMP_UNIT = 1
11	fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)	11	fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
12		12

tests/Makefile: Redo how to keep intermediate FATE-files

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -37,14 +37,14 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL FLAC_DEMUXER MJPEG_DECODER \ · 36 unmodified lines
37	AIFF_DEMUXER BMP_DECODER PNG_DECODER \	37	AIFF_DEMUXER BMP_DECODER PNG_DECODER \
38	FRAMECRC_MUXER PIPE_PROTOCOL) \	38	FRAMECRC_MUXER PIPE_PROTOCOL) \
39	+= fate-cover-art-aiff-id3v2-remux	39	+= fate-cover-art-aiff-id3v2-remux
40	fate-cover-art-aiff-id3v2-remux: CMD = transcode flac $(TARGET_SAMPLES)/cover_art/cover_art.flac aiff "-map 0 -map 0:v -map 0:v -map 0:v -c:a pcm_s16be -c:v:0 copy -filter:v:1 scale -c:v:1 png -filter:v:2 scale -c:v:2 bmp -c:v:3 copy -write_id3v2 1 -metadata:g unknown_key=unknown_value -metadata compilation=foo -metadata:s:v:0 title=first -metadata:s:v:1 title=second -metadata:s:v:1 comment=Illustration -metadata:s:v:2 title=third -metadata:s:v:2 comment=Conductor -metadata:s:v:3 title=fourth -metadata:s:v:3 comment=Composer" "-map 0 -c copy -t 0.1" "" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name"	40	fate-cover-art-aiff-id3v2-remux: CMD = transcode flac $(TARGET_SAMPLES)/cover_art/cover_art.flac aiff "-map 0 -map 0:v -map 0:v -map 0:v -c:a pcm_s16be -c:v:0 copy -filter:v:1 scale -c:v:1 png -filter:v:2 scale -c:v:2 bmp -c:v:3 copy -write_id3v2 1 -metadata:g unknown_key=unknown_value -metadata compilation=foo -metadata:s:v:0 title=first -metadata:s:v:1 title=second -metadata:s:v:1 comment=Illustration -metadata:s:v:2 title=third -metadata:s:v:2 comment=Conductor -metadata:s:v:3 title=fourth -metadata:s:v:3 comment=Composer" "-map 0 -c copy -t 0.1" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name"
41		41
42	FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MJPEG_DECODER \	42	FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MJPEG_DECODER \
43	SCALE_FILTER PNG_ENCODER BMP_ENCODER \	43	SCALE_FILTER PNG_ENCODER BMP_ENCODER \
44	MP3_MUXER BMP_DECODER PNG_DECODER \	44	MP3_MUXER BMP_DECODER PNG_DECODER \
45	FRAMECRC_MUXER PIPE_PROTOCOL) \	45	FRAMECRC_MUXER PIPE_PROTOCOL) \
46	+= fate-cover-art-mp3-id3v2-remux	46	+= fate-cover-art-mp3-id3v2-remux
47	fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name"	47	fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name"
48		48
49	# Also covers muxing and demuxing of nonstandard channel layouts into FLAC	49	# Also covers muxing and demuxing of nonstandard channel layouts into FLAC
50	# as well as the unorthodox multi_dim_quant option of the FLAC encoder.	50	# as well as the unorthodox multi_dim_quant option of the FLAC encoder.
@@ -55,7 +55,7 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER OGG_DEMUXER \ · 4 unmodified lines
55	FLAC_MUXER FLAC_DEMUXER FLAC_DECODER \	55	FLAC_MUXER FLAC_DEMUXER FLAC_DECODER \
56	FRAMECRC_MUXER PIPE_PROTOCOL) \	56	FRAMECRC_MUXER PIPE_PROTOCOL) \
57	+= fate-cover-art-flac-remux	57	+= fate-cover-art-flac-remux
58	fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.4" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus"	58	fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.4" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus"
59		59
60	FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes)	60	FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes)
61	FATE_COVER_ART = $(FCA_TEMP-yes)	61	FATE_COVER_ART = $(FCA_TEMP-yes)

@@ -55,7 +55,7 @@ fate-matroska-flac-extradata-update: CMD = transcode matroska $(TARGET_SAMPLES)/ · 54 unmodified lines
55	FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER OGG_DEMUXER \	55	FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER OGG_DEMUXER \
56	VORBIS_DECODER VORBIS_PARSER WEBM_MUXER) \	56	VORBIS_DECODER VORBIS_PARSER WEBM_MUXER) \
57	+= fate-webm-dash-chapters	57	+= fate-webm-dash-chapters
58	fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" "" -show_chapters	58	fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" -show_chapters
59		59
60	# The input file has a Block whose payload has a size of zero before reversing	60	# The input file has a Block whose payload has a size of zero before reversing
61	# header removal compression; it furthermore uses chained SeekHeads and has	61	# header removal compression; it furthermore uses chained SeekHeads and has
@@ -65,7 +65,7 @@ fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_cha · 3 unmodified lines
65	# It furthermore tests correct propagation of the description tag.	65	# It furthermore tests correct propagation of the description tag.
66	FATE_MATROSKA_FFMPEG_FFPROBE-$(call DEMMUX, MATROSKA, MATROSKA) \	66	FATE_MATROSKA_FFMPEG_FFPROBE-$(call DEMMUX, MATROSKA, MATROSKA) \
67	+= fate-matroska-zero-length-block	67	+= fate-matroska-zero-length-block
68	fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/zero_length_block.mks matroska "-c:s copy -dash 1 -dash_track_number 2000000000 -reserve_index_space 62 -metadata_header_padding 1 -default_mode infer_no_subs" "-c:s copy" "" "-show_entries stream_tags=description"	68	fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/zero_length_block.mks matroska "-c:s copy -dash 1 -dash_track_number 2000000000 -reserve_index_space 62 -metadata_header_padding 1 -default_mode infer_no_subs" "-c:s copy" "-show_entries stream_tags=description"
69		69
70	# This mainly tests the Matroska muxer's ability to shift the data	70	# This mainly tests the Matroska muxer's ability to shift the data
71	# to create enough free space to write the Cues at the front.	71	# to create enough free space to write the Cues at the front.
@@ -83,12 +83,12 @@ fate-matroska-move-cues-to-front: CMD = transcode wav $(TARGET_SAMPLES)/audio-re · 11 unmodified lines
83	# the initially reserved amount of space turns out to be insufficient.	83	# the initially reserved amount of space turns out to be insufficient.
84	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER HEVC_DECODER) \	84	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER HEVC_DECODER) \
85	+= fate-matroska-dovi-write-config7	85	+= fate-matroska-dovi-write-config7
86	fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list"	86	fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "-show_entries stream_side_data_list"
87		87
88	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER \	88	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER \
89	HEVC_DECODER AAC_DECODER) \	89	HEVC_DECODER AAC_DECODER) \
90	+= fate-matroska-dovi-write-config8	90	+= fate-matroska-dovi-write-config8
91	fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-c copy" "-map 0 -c copy -t 0.4" "" "-show_entries stream_side_data_list -select_streams v"	91	fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-c copy" "-map 0 -c copy -t 0.4" "-show_entries stream_side_data_list -select_streams v"
92		92
93	# This tests the scenario like tickets #4536, #5784 where	93	# This tests the scenario like tickets #4536, #5784 where
94	# the first packet (with the overall lowest dts) is a video packet,	94	# the first packet (with the overall lowest dts) is a video packet,
@@ -120,7 +120,7 @@ fate-matroska-qt-mode: CMD = transcode mov $(TARGET_SAMPLES)/svq1/marymary-shack · 25 unmodified lines
120	# and modifying and writing colorspace properties.	120	# and modifying and writing colorspace properties.
121	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, H264_DECODER H264_PARSER) \	121	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, H264_DECODER H264_PARSER) \
122	+= fate-matroska-spherical-mono-remux	122	+= fate-matroska-spherical-mono-remux
123	fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer"	123	fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer"
124		124
125	# The input file of the following test contains Content Light Level as well as	125	# The input file of the following test contains Content Light Level as well as
126	# Mastering Display Metadata and so this test tests correct muxing and demuxing	126	# Mastering Display Metadata and so this test tests correct muxing and demuxing
@@ -132,7 +132,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, FFV1 PRORES, MATROSKA, MXF_DEMUXE · 5 unmodified lines
132	PCM_S24LE_DECODER ARESAMPLE_FILTER \	132	PCM_S24LE_DECODER ARESAMPLE_FILTER \
133	PCM_S16BE_ENCODER NOISE_BSF) \	133	PCM_S16BE_ENCODER NOISE_BSF) \
134	+= fate-matroska-mastering-display-metadata	134	+= fate-matroska-mastering-display-metadata
135	fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:drop=-4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name"	135	fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:drop=-4" "-map 0 -c copy" "-show_entries stream_side_data_list:stream=index,codec_name"
136		136
137	# This test tests remuxing annex B H.264 into Matroska. It also tests writing	137	# This test tests remuxing annex B H.264 into Matroska. It also tests writing
138	# the correct interlaced flags and overriding the sample aspect ratio, leading	138	# the correct interlaced flags and overriding the sample aspect ratio, leading
@@ -148,7 +148,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, PCM_S32LE MP2, MATROSKA, \ · 9 unmodified lines
148	ARESAMPLE_FILTER \	148	ARESAMPLE_FILTER \
149	PCM_S32BE_ENCODER) \	149	PCM_S32BE_ENCODER) \
150	+= fate-matroska-h264-remux	150	+= fate-matroska-h264-remux
151	fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "" "-show_entries stream=index,codec_name:stream_tags=title,language"	151	fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "-show_entries stream=index,codec_name:stream_tags=title,language"
152		152
153	# Tests writing BlockAdditional and BlockGroups with ReferenceBlock elements;	153	# Tests writing BlockAdditional and BlockGroups with ReferenceBlock elements;
154	# it also tests setting a track as suitable for hearing impaired.	154	# it also tests setting a track as suitable for hearing impaired.
@@ -156,12 +156,12 @@ fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_int · 1 unmodified line
156	# (the input file lacks ReferenceBlock elements making everything a keyframe).	156	# (the input file lacks ReferenceBlock elements making everything a keyframe).
157	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP8_PARSER) \	157	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP8_PARSER) \
158	+= fate-matroska-vp8-alpha-remux	158	+= fate-matroska-vp8-alpha-remux
159	fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "" "-show_entries stream_disposition:stream_side_data_list"	159	fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "-show_entries stream_disposition:stream_side_data_list"
160		160
161	# The audio stream to be remuxed here has AV_DISPOSITION_VISUAL_IMPAIRED.	161	# The audio stream to be remuxed here has AV_DISPOSITION_VISUAL_IMPAIRED.
162	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MPEGTS_DEMUXER AC3_DECODER) \	162	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MPEGTS_DEMUXER AC3_DECODER) \
163	+= fate-matroska-mpegts-remux	163	+= fate-matroska-mpegts-remux
164	fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired -default_mode infer" "-map 0 -c copy" "" "-show_entries stream_disposition:stream=index"	164	fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired -default_mode infer" "-map 0 -c copy" "-show_entries stream_disposition:stream=index"
165		165
166	FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono	166	FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono
167	fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv	167	fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv
@@ -172,7 +172,7 @@ fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entrie · 4 unmodified lines
172	# with multiple CueTrackPositions if the timestamps coincide.	172	# with multiple CueTrackPositions if the timestamps coincide.
173	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, WEBVTT_DEMUXER) \	173	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, WEBVTT_DEMUXER) \
174	+= fate-webm-webvtt-remux	174	+= fate-webm-webvtt-remux
175	fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32"	175	fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32"
176		176
177	FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)	177	FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)
178	FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes)	178	FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes)

@@ -128,22 +128,22 @@ fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets · 127 unmodified lines
128		128
129	FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, OGG_DEMUXER VORBIS_DECODER) \	129	FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, OGG_DEMUXER VORBIS_DECODER) \
130	+= fate-mov-mp4-chapters	130	+= fate-mov-mp4-chapters
131	fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "" "-show_chapters"	131	fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "-show_chapters"
132		132
133	FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \	133	FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \
134	+= fate-mov-cover-image	134	+= fate-mov-cover-image
135	fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name"	135	fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "-show_entries stream_disposition=attached_pic:stream=index,codec_name"
136		136
137	FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp	137	FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp
138	fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags"	138	fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags"
139	fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags"	139	fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags"
140		140
141	# Resulting remux should have:	141	# Resulting remux should have:
142	# 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED	142	# 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED
143	# 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED \| DESCRIPTIONS	143	# 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED \| DESCRIPTIONS
144	FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, MPEGTS_DEMUXER AC3_DECODER) \	144	FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, MPEGTS_DEMUXER AC3_DECODER) \
145	+= fate-mov-mp4-disposition-mpegts-remux	145	+= fate-mov-mp4-disposition-mpegts-remux
146	fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "" "-of json -show_entries stream_disposition:stream=index"	146	fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "-of json -show_entries stream_disposition:stream=index"
147		147
148	FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes)	148	FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes)
149		149