fate/all: fix multiple dependencies

Nicolas Gaullier committed 1 year ago

Commit 1ece56d1 parent 7de403818 files · +34 −30Browse files

Unified · Split

18 files

tests/fate/api.mak +1 −1
tests/fate/cbs.mak +1 −1
tests/fate/ffmpeg.mak +3 −3
tests/fate/filter-audio.mak +4 −4
tests/fate/filter-video.mak +1 −1
tests/fate/fits.mak +2 −2
tests/fate/gif.mak +1 −1
tests/fate/h264.mak +3 −3
tests/fate/image.mak +1 −1
tests/fate/libavformat.mak +1 −1
tests/fate/matroska.mak +4 −3
tests/fate/ogg-flac.mak +1 −1
tests/fate/pixfmt.mak +1 −0
tests/fate/segment.mak +3 −3
tests/fate/vcodec.mak +3 −1
tests/fate/video.mak +1 −1
tests/fate/voice.mak +2 −2
tests/fate/xvid.mak +1 −1

@@ -8,7 +8,7 @@ fate-api-band: $(APITESTSDIR)/api-band-test$(EXESUF) · 7 unmodified lines
8	8	fate-api-band: CMD = run $(APITESTSDIR)/api-band-test$(EXESUF) $(TARGET_SAMPLES)/mpeg4/resize_down-up.h263
9	9	fate-api-band: CMP = null
10	10
11		−FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264
	11	+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264, H264_PARSER) += fate-api-h264
12	12	fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF)
13	13	fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test$(EXESUF) $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
14	14

tests/fate/cbs.mak+1−1

@@ -175,7 +175,7 @@ FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_MUXER HEVC_PARSER FILTER_UNITS_BS · 174 unmodified lines
175	175	fate-cbs-hevc-metadata-set-color: CMD = md5 -i $(TARGET_SAMPLES)/hevc-conformance/AMP_A_Samsung_4.bit -c:v copy -bsf:v hevc_metadata=colour_primaries=0:transfer_characteristics=0:matrix_coefficients=3 -f hevc
176	176	fate-cbs-hevc-metadata-set-color: CMP = oneline
177	177	fate-cbs-hevc-metadata-set-color: REF = d073124fca9e30a46c173292f948967c
178		−FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER, HEVC_METADATA_BSF, HEVC_MUXER) += fate-cbs-hevc-metadata-set-color
	178	+FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_METADATA_BSF HEVC_MUXER) += fate-cbs-hevc-metadata-set-color
179	179
180	180	FATE_SAMPLES_AVCONV += $(FATE_CBS_HEVC-yes)
181	181	fate-cbs-hevc: $(FATE_CBS_HEVC-yes)

tests/fate/ffmpeg.mak+3−3

@@ -40,7 +40,7 @@ fate-force_key_frames-source-dup: CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra · 39 unmodified lines
40	40	-c:v mpeg2video -g 400 -sc_threshold 99999 \
41	41	-force_key_frames source -r 39 -force_fps -strict experimental
42	42
43		−FATE_SAMPLES_FFMPEG-$(call ENCDEC, MPEG2VIDEO H264, FRAMECRC H264, CROP_FILTER DRAWBOX_FILTER) += \
	43	+FATE_SAMPLES_FFMPEG-$(call ENCDEC, MPEG2VIDEO H264, FRAMECRC H264, H264_PARSER CROP_FILTER DRAWBOX_FILTER) += \
44	44	fate-force_key_frames-source fate-force_key_frames-source-drop fate-force_key_frames-source-dup
45	45
46	46	# Tests that the video is properly autorotated using the contained
@@ -171,7 +171,7 @@ FATE_STREAMCOPY-$(call REMUX, PSP MOV, H264_PARSER H264_DECODER) += fate-copy-ps · 124 unmodified lines
171	171	fate-copy-psp: CMD = transcode "mov" $(TARGET_SAMPLES)/h264/wwwq_cut.mp4\
172	172	psp "-c copy" "-codec copy"
173	173
174		−FATE_STREAMCOPY-$(call FRAMEMD5, FLV, H264) += fate-ffmpeg-streamloop-copy
	174	+FATE_STREAMCOPY-$(call FRAMEMD5, FLV, H264, H264_PARSER) += fate-ffmpeg-streamloop-copy
175	175	fate-ffmpeg-streamloop-copy: CMD = framemd5 -stream_loop 2 -i $(TARGET_SAMPLES)/flv/streamloop.flv -c copy
176	176
177	177	tests/data/audio_shorter_than_video.nut: TAG = GEN
@@ -255,7 +255,7 @@ fate-ffmpeg-streamcopy-t: CMP = null · 77 unmodified lines
255	255	fate-ffmpeg-streamcopy-t: CMD = ffmpeg \
256	256	-stream_loop -1 -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \
257	257	-c copy -f null -t 1 -
258		−FATE_FFMPEG-$(call REMUX, RAWVIDEO) += fate-ffmpeg-streamcopy-t
	258	+FATE_FFMPEG-$(call REMUX, RAWVIDEO, NULL_MUXER) += fate-ffmpeg-streamcopy-t
259	259
260	260	# Test loopback decoding and passing the output to a complex graph.
261	261	fate-ffmpeg-loopback-decoding: tests/data/vsynth1.yuv

tests/fate/filter-audio.mak+4−4

@@ -210,7 +210,7 @@ tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) \| tests/data · 209 unmodified lines
210	210	-f lavfi -i "aevalsrc=cos(2PIt)sin(2PI(440+4t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \
211	211	-segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/hls-out-%03d.ts 2>/dev/null
212	212
213		−FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER ARESAMPLE_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls
	213	+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ARESAMPLE AEVALSRC, HLS MPEGTS, MP2 PCM_F64LE, MP2FIXED, SEGMENT MPEGTS, LAVFI_INDEV) += fate-filter-hls
214	214	fate-filter-hls: tests/data/hls-list.m3u8
215	215	fate-filter-hls: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list.m3u8 -af aresample
216	216
@@ -224,7 +224,7 @@ tests/data/hls-list-append.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) \| tests/data · 7 unmodified lines
224	224	-hls_flags append_list -codec:a mp2fixed -hls_segment_filename $(TARGET_PATH)/tests/data/hls-append-out-%03d.ts \
225	225	$(TARGET_PATH)/tests/data/hls-list-append.m3u8 2>/dev/null
226	226
227		−FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER ARESAMPLE_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls-append
	227	+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ARESAMPLE AEVALSRC ASETPTS, HLS MPEGTS, PCM_F64LE MP2, MP2FIXED, SEGMENT HLS MPEGTS, LAVFI_INDEV) += fate-filter-hls-append
228	228	fate-filter-hls-append: tests/data/hls-list-append.m3u8
229	229	fate-filter-hls-append: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list-append.m3u8 -af asetpts=N*23,aresample
230	230
@@ -249,7 +249,7 @@ $(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav · 18 unmodified lines
249	249	$(FATE_AMIX): CMP = oneoff
250	250	$(FATE_AMIX): CMP_UNIT = f32
251	251
252		−FATE_AFILTER_SAMPLES-$(CONFIG_ARESAMPLE_FILTER) += fate-filter-aresample
	252	+FATE_AFILTER_SAMPLES-$(call DEMDEC, FLV, NELLYMOSER, PCM_S16LE_MUXER ARESAMPLE_FILTER) += fate-filter-aresample
253	253	fate-filter-aresample: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv
254	254	fate-filter-aresample: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1:first_pts=0
255	255	fate-filter-aresample: CMP = oneoff
@@ -412,7 +412,7 @@ fate-filter-hdcd-s32p: CMD = md5 -i $(SRC) -af hdcd -f s32le · 156 unmodified lines
412	412	fate-filter-hdcd-s32p: CMP = oneline
413	413	fate-filter-hdcd-s32p: REF = 0c5513e83eedaa10ab6fac9ddc173cf5
414	414
415		−FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, ATEMPO, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-atempo
	415	+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, ATEMPO, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE WAV) += fate-filter-atempo
416	416	fate-filter-atempo: tests/data/asynth-44100-1.wav
417	417	fate-filter-atempo: CMD = pcm -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -af "atempo=2.0"
418	418	fate-filter-atempo: CMP = oneoff

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

@@ -723,7 +723,7 @@ CROPDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER MOVIE_FILTER MESTIMATE_ · 722 unmodified lines
723	723	FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect
724	724	fate-filter-metadata-cropdetect: SRC = $(TARGET_SAMPLES)/filter/cropdetect.mp4
725	725	fate-filter-metadata-cropdetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',cropdetect=max_outliers=3"
726		−FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect1
	726	+FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS) MPEG4_DECODER) += fate-filter-metadata-cropdetect1
727	727	fate-filter-metadata-cropdetect1: SRC = $(TARGET_SAMPLES)/filter/cropdetect1.mp4
728	728	fate-filter-metadata-cropdetect1: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',mestimate,cropdetect=mode=mvedges,metadata=mode=print"
729	729	FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect2

tests/fate/fits.mak+2−2

@@ -23,7 +23,7 @@ fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -p · 22 unmodified lines
23	23	FATE_FITS_DEC-$(call FRAMECRC, FITS, FITS, SCALE_FILTER) += fate-fitsdec-bitpix-64
24	24	fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16le -vf scale
25	25
26		−FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += fate-fitsdec-multi
	26	+FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER GIF_PARSER SCALE_FILTER) += fate-fitsdec-multi
27	27	fate-fitsdec-multi: tests/data/fits-multi.fits
28	28	fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap
29	29
@@ -42,7 +42,7 @@ fate-fitsenc%: CMD = framecrc -auto_conversion_filters -i $(SRC) -c:v fits -pix_ · 12 unmodified lines
42	42
43	43	FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be
44	44	$(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits
45		−FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%)
	45	+FATE_FITS_ENC-$(call TRANSCODE, FITS, FITS, GIF_DEMUXER GIF_DECODER GIF_PARSER SCALE_FILTER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%)
46	46
47	47	FATE_FITS += $(FATE_FITS_ENC-yes)
48	48	fate-fitsenc: $(FATE_FITS_ENC-yes)

tests/fate/gif.mak+1−1

@@ -13,7 +13,7 @@ fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_ · 12 unmodified lines
13	13	FATE_GIF += fate-gif-deal
14	14	fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -fps_mode cfr -pix_fmt bgra -auto_conversion_filters
15	15
16		−FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF)
	16	+FATE_GIF-$(call FRAMECRC, GIF, GIF, GIF_PARSER SCALE_FILTER) += $(FATE_GIF)
17	17
18	18	fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@)))
19	19	fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif

tests/fate/h264.mak+3−3

@@ -225,15 +225,15 @@ FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-unescaped-extradata · 224 unmodified lines
225	225	# this sample contains field-coded frames, with both fields in a single packet
226	226	FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-twofields-packet
227	227
228		−FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF H264_METADATA_BSF SCALE_FILTER) += fate-h264-bsf-mp4toannexb-new-extradata
	228	+FATE_H264-$(call DEMDEC, MOV H264, H264, H264_PARSER H264_MUXER H264_MP4TOANNEXB_BSF H264_METADATA_BSF SCALE_FILTER) += fate-h264-bsf-mp4toannexb-new-extradata
229	229
230	230	FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb \
231	231	fate-h264-bsf-mp4toannexb-2 \
232	232
233		−FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF EXTRACT_EXTRADATA_BSF) += fate-h264_mp4toannexb_ticket5927 \
	233	+FATE_H264-$(call DEMDEC, 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 DEMMUX, H264, MOV, DTS2PTS_BSF) += fate-h264-bsf-dts2pts
	236	+FATE_H264-$(call DEMMUX, H264, MOV, H264_PARSER 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/image.mak+1−1

@@ -331,7 +331,7 @@ FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += $(FATE_EXR) · 330 unmodified lines
331	331	FATE_IMAGE_FRAMECRC += $(FATE_EXR-yes)
332	332	fate-exr: $(FATE_EXR-yes)
333	333
334		−FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER) += fate-jpg-12bpp
	334	+FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG, SCALE_FILTER SETSAR_FILTER) += fate-jpg-12bpp
335	335	fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -f rawvideo -pix_fmt gray16le -vf setsar=sar=sar,scale
336	336
337	337	FATE_JPG += fate-jpg-jfif

tests/fate/libavformat.mak+1−1

@@ -18,7 +18,7 @@ FATE_LIBAVFORMAT-yes += fate-url · 17 unmodified lines
18	18	fate-url: libavformat/tests/url$(EXESUF)
19	19	fate-url: CMD = run libavformat/tests/url$(EXESUF)
20	20
21		−FATE_LIBAVFORMAT-$(CONFIG_MOV_MUXER) += fate-movenc
	21	+FATE_LIBAVFORMAT-$(call ALLYES, MP4_MUXER ISMV_MUXER) += fate-movenc
22	22	fate-movenc: libavformat/tests/movenc$(EXESUF)
23	23	fate-movenc: CMD = run libavformat/tests/movenc$(EXESUF)
24	24

tests/fate/matroska.mak+4−3

@@ -9,7 +9,7 @@ fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/m · 8 unmodified lines
9	9	# This tests that the matroska demuxer supports modifying the colorspace
10	10	# properties in remuxing (-c:v copy)
11	11	# It also tests automatic insertion of the vp9_superframe bitstream filter
12		−FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux
	12	+FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA, VP9_DECODER VP9_PARSER MD5_PROTOCOL) += fate-matroska-remux
13	13	fate-matroska-remux: CMD = md5pipe -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska
14	14	fate-matroska-remux: CMP = oneline
15	15	fate-matroska-remux: REF = b9c7b650349972c9dce42ab79b472917
@@ -213,6 +213,7 @@ fate-matroska-ogg-opus-remux: CMD = transcode ogg $(TARGET_SAMPLES)/ogg/intro-pa · 197 unmodified lines
213	213	FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MXF_DEMUXER PCM_S16LE_DECODER \
214	214	MP2FIXED_ENCODER ARESAMPLE_FILTER \
215	215	MPEG2VIDEO_DECODER MPEGVIDEO_PARSER \
	216	+ MPEGAUDIO_PARSER \
216	217	EXTRACT_EXTRADATA_BSF) += fate-matroska-encoding-delay
217	218	fate-matroska-encoding-delay: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Sony-00001.mxf matroska "-c:v copy -af aresample -c:a mp2fixed" "-copyts -c copy" "-show_packets -show_entries stream=codec_name,initial_padding -read_intervals %0.05"
218	219
@@ -234,7 +235,7 @@ fate-matroska-pgs-remux-durations: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs · 15 unmodified lines
234	235	FATE_MATROSKA-$(call REMUX, MATROSKA, MPEGTS_DEMUXER DVBSUB_PARSER SETTS_BSF) += fate-matroska-dvbsub-remux
235	236	fate-matroska-dvbsub-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts matroska "-map 0:s -map 0:s -t 20 -c copy -bsf:0 setts=duration=if(gt(DURATION\,0)\,DURATION\,if(eq(PTS\,NOPTS)\,0\,if(eq(NEXT_PTS\,NOPTS)\,0\,NEXT_PTS-PTS))):pts=PTS" "-map 0 -c copy"
236	237
237		−FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono
	238	+FATE_MATROSKA_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-matroska-spherical-mono
238	239	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
239	240
240	241	# This test tests the handling of AVStereo3D information, in particular
@@ -272,7 +273,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, VP9_PARSER) \ · 31 unmodified lines
272	273	+= fate-webm-hdr10-plus-remux
273	274	fate-webm-hdr10-plus-remux: CMD = transcode webm $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.webm webm "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets"
274	275
275		−FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP9_PARSER) \
	276	+FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP9_DECODER VP9_PARSER) \
276	277	+= fate-matroska-hdr10-plus-remux
277	278	fate-matroska-hdr10-plus-remux: CMD = transcode webm $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.webm matroska "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets"
278	279

tests/fate/ogg-flac.mak+1−1

@@ -2,7 +2,7 @@ FATE_OGG_FLAC += fate-ogg-flac-chained-meta · 1 unmodified line
2	2	fate-ogg-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt
3	3	fate-ogg-flac-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg
4	4
5		−FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC) += $(FATE_OGG_FLAC)
	5	+FATE_OGG_FLAC-$(call DEMDEC, OGG, FLAC, FLAC_PARSER) += $(FATE_OGG_FLAC)
6	6
7	7	FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes)
8	8

tests/fate/pixfmt.mak+1−0

@@ -33,6 +33,7 @@ $(FATE_PIXFMT): CMD = pixfmt_conversion · 32 unmodified lines
33	33	$(FATE_PIXFMT): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
34	34	$(FATE_PIXFMT): $(VREF)
35	35
	36	+FATE_PIXFMT := $(if $(call DEMDEC, IMAGE2, PGMYUV RAWVIDEO, RAWVIDEO_DEMUXER RAWVIDEO_MUXER RAWVIDEO_ENCODER FILE_PROTOCOL), $(FATE_PIXFMT))
36	37	PIXFMT_16_LIST = gray16le \
37	38	gray16be \
38	39	yuv420p16le \

tests/fate/segment.mak+3−3

@@ -35,20 +35,20 @@ tests/data/adts-to-mkv-cated-%.mkv: tests/data/adts-to-mkv-header.mkv tests/data · 34 unmodified lines
35	35	FATE_SEGMENT += fate-segment-mp4-to-ts
36	36	fate-segment-mp4-to-ts: tests/data/mp4-to-ts.m3u8
37	37	fate-segment-mp4-to-ts: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/mp4-to-ts.m3u8 -c copy
38		−FATE_SEGMENT-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF MPEGTS_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER EXTRACT_EXTRADATA_BSF) += fate-segment-mp4-to-ts
	38	+FATE_SEGMENT-$(call DEMDEC, MOV HLS MATROSKA, H264, H264_PARSER H264_MP4TOANNEXB_BSF MPEGTS_MUXER STREAM_SEGMENT_MUXER EXTRACT_EXTRADATA_BSF) += fate-segment-mp4-to-ts
39	39
40	40	FATE_SEGMENT += fate-segment-adts-to-mkv
41	41	fate-segment-adts-to-mkv: tests/data/adts-to-mkv.m3u8
42	42	fate-segment-adts-to-mkv: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/adts-to-mkv.m3u8 -c copy
43	43	fate-segment-adts-to-mkv: REF = $(SRC_PATH)/tests/ref/fate/segment-adts-to-mkv-header-all
44		−FATE_SEGMENT-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += fate-segment-adts-to-mkv
	44	+FATE_SEGMENT-$(call DEMDEC, AAC HLS MATROSKA, AAC, AAC_ADTSTOASC_BSF MATROSKA_MUXER SEGMENT_MUXER) += fate-segment-adts-to-mkv
45	45
46	46	FATE_SEGMENT_ALLPARTS = $(FATE_SEGMENT_PARTS)
47	47	FATE_SEGMENT_ALLPARTS += all
48	48	FATE_SEGMENT_SPLIT += $(FATE_SEGMENT_ALLPARTS:%=fate-segment-adts-to-mkv-header-%)
49	49	$(foreach N,$(FATE_SEGMENT_ALLPARTS),$(eval $(N:%=fate-segment-adts-to-mkv-header-%): tests/data/adts-to-mkv-cated-$(N).mkv))
50	50	fate-segment-adts-to-mkv-header-%: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/$(@:fate-segment-adts-to-mkv-header-%=adts-to-mkv-cated-%).mkv -c copy
51		−FATE_SEGMENT-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += $(FATE_SEGMENT_SPLIT)
	51	+FATE_SEGMENT-$(call DEMDEC, AAC HLS MATROSKA, AAC, AAC_ADTSTOASC_BSF MATROSKA_MUXER SEGMENT_MUXER) += $(FATE_SEGMENT_SPLIT)
52	52
53	53	FATE_SAMPLES_FFMPEG += $(FATE_SEGMENT-yes)
54	54

tests/fate/vcodec.mak+3−1

@@ -207,9 +207,11 @@ FATE_VCODEC-$(call ENCDEC, H261, AVI) += h261 h261-trellis · 206 unmodified lines
207	207	fate-vsynth%-h261: ENCOPTS = -qscale 11 -flags +loop
208	208	fate-vsynth%-h261-trellis: ENCOPTS = -qscale 12 -trellis 1 -mbd rd
209	209
210		−FATE_VCODEC-$(call ENCDEC, H263, AVI) += h263 h263-obmc h263p
	210	+FATE_VCODEC-$(call ENCDEC, H263, AVI) += h263 h263-obmc
211	211	fate-vsynth%-h263: ENCOPTS = -qscale 10
212	212	fate-vsynth%-h263-obmc: ENCOPTS = -qscale 10 -obmc 1
	213	+
	214	+FATE_VCODEC-$(call ENCDEC, H263P, AVI) += h263p
213	215	fate-vsynth%-h263p: ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300
214	216
215	217	FATE_VCODEC_SCALE-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra

tests/fate/video.mak+1−1

@@ -267,7 +267,7 @@ fate-mjpeg-ticket3229: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET · 266 unmodified lines
267	267	FATE_VIDEO-$(call FRAMECRC, MVI, MOTIONPIXELS, SCALE_FILTER) += fate-motionpixels
268	268	fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111 -vf scale
269	269
270		−FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186
	270	+FATE_VIDEO-$(call FRAMECRC, MPEGTS, MPEG2VIDEO, MPEGVIDEO_PARSER) += fate-mpeg2-field-enc fate-mpeg2-ticket186
271	271	fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30
272	272	fate-mpeg2-ticket186: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/t.mpg -an
273	273

tests/fate/voice.mak+2−2

@@ -1,7 +1,7 @@
1	1	FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1
2	2	fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722
3	3
4		−FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode
	4	+FATE_G722-$(call TRANSCODE, ADPCM_G722, WAV, PCM_S16LE_DECODER) += fate-g722-encode
5	5	fate-g722-encode: tests/data/asynth-16000-1.wav
6	6	fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
7	7	fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722
@@ -51,7 +51,7 @@ fate-g726-encode-5bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b: · 43 unmodified lines
51	51	$(FATE_G726): tests/data/asynth-8000-1.wav
52	52	$(FATE_G726): SRC = tests/data/asynth-8000-1.wav
53	53
54		−FATE_VOICE-$(call ENCMUX, ADPCM_G726, WAV) += $(FATE_G726)
	54	+FATE_VOICE-$(call TRANSCODE, ADPCM_G726, WAV, PCM_S16LE_DECODER) += $(FATE_G726)
55	55	fate-g726: $(FATE_G726)
56	56
57	57	FATE_GSM-$(call DEMDEC, WAV, GSM) += fate-gsm-ms

tests/fate/xvid.mak+1−1

@@ -1,7 +1,7 @@
1	1	fate-xvid-custom-matrix: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263
2	2	fate-xvid-idct: CMD = framemd5 -flags +bitexact -cpuflags all -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263
3	3
4		−FATE_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix fate-xvid-idct
	4	+FATE_XVID-$(call DEMDEC, M4V, MPEG4, MPEG4VIDEO_PARSER) += fate-xvid-custom-matrix fate-xvid-idct
5	5
6	6	FATE_SAMPLES_AVCONV += $(FATE_XVID-yes)
7	7

fate/all: fix multiple dependencies

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code