---
tests/fate/concatdec.mak | 2 +-
tests/fate/demux.mak | 16 ++++++++--------
tests/fate/flvenc.mak | 2 +-
tests/fate/h264.mak | 8 +++++---
tests/fate/hevc.mak | 4 ++--
tests/fate/lavf-container.mak | 8 ++++----
tests/fate/segment.mak | 2 +-
7 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/tests/fate/concatdec.mak b/tests/fate/concatdec.mak
index c0dc6d4c94..9b21f1dd4b 100644
--- a/tests/fate/concatdec.mak
+++ b/tests/fate/concatdec.mak
@@ -23,5 +23,5 @@ $(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF),$(eval
fate-concat-demuxer-exte
$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF),$(eval
fate-concat-demuxer-extended-lavf-$(D): CMD = concat
$(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5))
FATE_CONCAT_DEMUXER +=
$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF:%=fate-concat-demuxer-extended-lavf-%)
-FATE_CONCAT_DEMUXER := $(if $(CONFIG_CONCAT_DEMUXER), $(FATE_CONCAT_DEMUXER))
+FATE_CONCAT_DEMUXER := $(if $(call ALLYES, CONCAT_DEMUXER
EXTRACT_EXTRADATA_BSF), $(FATE_CONCAT_DEMUXER))
FATE_FFPROBE += $(FATE_CONCAT_DEMUXER)
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index e0d1fccc8f..24306caa11 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -13,7 +13,7 @@ fate-aa-demux: CMD = framecrc -i $(TARGET_SAMPLES)/aa/bush.aa
-c:a copy
FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux
fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy
-FATE_SAMPLES_DEMUX-$(call DEMDEC, AV1, AV1) += fate-av1-annexb-demux
+FATE_SAMPLES_DEMUX-$(call DEMDEC, AV1, AV1, EXTRACT_EXTRADATA_BSF) +=
fate-av1-annexb-demux
fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i
$(TARGET_SAMPLES)/av1/annexb.obu -c:v copy
FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast
@@ -29,7 +29,7 @@ fate-bcstm: CMD = crc -i
$(TARGET_SAMPLES)/bfstm/loz-mm-mikau.bcstm -c:a copy
FATE_SAMPLES_DEMUX-$(CONFIG_BRSTM_DEMUXER) += fate-brstm
fate-brstm: CMD = crc -i $(TARGET_SAMPLES)/brstm/lozswd_partial.brstm -c:a copy
-FATE_FFPROBE_DEMUX-$(call ALLYES, CAVSVIDEO_DEMUXER CAVSVIDEO_PARSER) +=
fate-cavs-demux
+FATE_FFPROBE_DEMUX-$(call ALLYES, CAVSVIDEO_DEMUXER CAVSVIDEO_PARSER
EXTRACT_EXTRADATA_BSF) += fate-cavs-demux
fate-cavs-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/cavs/bunny.mp4
FATE_SAMPLES_DEMUX-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux
@@ -54,13 +54,13 @@ fate-flv-demux: CMD = ffprobe_demux
$(TARGET_SAMPLES)/flv/Enigma_Principles_of_L
FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux
fate-gif-demux: CMD = framecrc -i
$(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -c:v copy
-FATE_SAMPLES_DEMUX-$(call ALLYES, IV8_DEMUXER MPEG4VIDEO_PARSER) +=
fate-iv8-demux
+FATE_SAMPLES_DEMUX-$(call ALLYES, IV8_DEMUXER MPEG4VIDEO_PARSER
EXTRACT_EXTRADATA_BSF) += fate-iv8-demux
fate-iv8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/iv8/zzz-partial.mpg -c:v
copy
FATE_SAMPLES_DEMUX-$(CONFIG_JV_DEMUXER) += fate-jv-demux
fate-jv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -c:v copy -c:a
copy
-FATE_SAMPLES_DEMUX-$(call ALLYES, LMLM4_DEMUXER MPEG4VIDEO_PARSER) +=
fate-lmlm4-demux
+FATE_SAMPLES_DEMUX-$(call ALLYES, LMLM4_DEMUXER MPEG4VIDEO_PARSER
EXTRACT_EXTRADATA_BSF) += fate-lmlm4-demux
fate-lmlm4-demux: CMD = framecrc -i
$(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -c:a copy -c:v copy
FATE_SAMPLES_DEMUX-$(CONFIG_XA_DEMUXER) += fate-maxis-xa
@@ -82,7 +82,7 @@ fate-mov-mp3-demux: CMD = framecrc -i
$(TARGET_SAMPLES)/mpegaudio/packed_maindat
FATE_FFPROBE_DEMUX-$(call ALLYES, MPEGTS_DEMUXER ARESAMPLE_FILTER) +=
fate-ts-opus-demux
fate-ts-opus-demux: CMD = ffprobe_demux
$(TARGET_SAMPLES)/opus/test-8-7.1.opus-small.ts
-FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux
+FATE_FFPROBE_DEMUX-$(call ALLYES, MPEGTS_DEMUXER EXTRACT_EXTRADATA_BSF) +=
fate-ts-small-demux
fate-ts-small-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/mpegts/h264small.ts
FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv
@@ -91,7 +91,7 @@ fate-mtv: CMD = framecrc -i
$(TARGET_SAMPLES)/mtv/comedian_auto-partial.mtv -c c
FATE_SAMPLES_DEMUX-$(call DEMDEC, MXF, MPEG4) += fate-mxf-demux
fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -c:a copy
-c:v copy
-FATE_SAMPLES_DEMUX-$(call ALLYES, NC_DEMUXER MPEG4VIDEO_PARSER) +=
fate-nc-demux
+FATE_SAMPLES_DEMUX-$(call ALLYES, NC_DEMUXER MPEG4VIDEO_PARSER
EXTRACT_EXTRADATA_BSF) += fate-nc-demux
fate-nc-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nc-camera/nc-sample-partial
-c:v copy
FATE_SAMPLES_DEMUX-$(CONFIG_NISTSPHERE_DEMUXER) += fate-nistsphere-demux
@@ -145,7 +145,7 @@ fate-wav-ac3: CMD = framecrc -i
$(TARGET_SAMPLES)/ac3/diatonis_invisible_order_a
FATE_SAMPLES_DEMUX-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud
fate-westwood-aud: CMD = framecrc -i
$(TARGET_SAMPLES)/westwood-aud/excellent.aud -c copy
-FATE_SAMPLES_DEMUX-$(call ALLYES, WTV_DEMUXER MPEGVIDEO_PARSER) +=
fate-wtv-demux
+FATE_SAMPLES_DEMUX-$(call ALLYES, WTV_DEMUXER MPEGVIDEO_PARSER
EXTRACT_EXTRADATA_BSF) += fate-wtv-demux
fate-wtv-demux: CMD = framecrc -i
$(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -c:v copy -c:a copy
FATE_SAMPLES_DEMUX-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux
@@ -154,7 +154,7 @@ fate-xmv-demux: CMD = framecrc -i
$(TARGET_SAMPLES)/xmv/logos1p.fmv -c:v copy -c
FATE_SAMPLES_DEMUX-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy
-FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
+FATE_FFPROBE_DEMUX-$(call ALLYES, MPEGTS_DEMUXER EXTRACT_EXTRADATA_BSF) +=
fate-ts-demux
fate-ts-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ac3/mp3ac325-4864-small.ts
FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-timed-id3-demux
diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak
index e3703a8cc5..1e486f7266 100644
--- a/tests/fate/flvenc.mak
+++ b/tests/fate/flvenc.mak
@@ -9,7 +9,7 @@ FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER
VP9_PARSER) += fa
fate-enhanced-flv-vp9: CMD = transcode ivf
$(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf\
flv "-c copy" "-c copy"
-FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER AV1_DECODER
AV1_PARSER) += fate-enhanced-flv-av1
+FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER AV1_DECODER
AV1_PARSER EXTRACT_EXTRADATA_BSF) += fate-enhanced-flv-av1
fate-enhanced-flv-av1: CMD = stream_remux ivf
$(TARGET_SAMPLES)/av1/seq_hdr_op_param_info.ivf "-c:v av1" \
flv "-c copy" "-c:v av1" "-c copy"
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index e7038387ea..9152707e56 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -228,8 +228,9 @@ FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF
SCALE_FILTER) += fate-h
FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) +=
fate-h264-bsf-mp4toannexb \
fate-h264-bsf-mp4toannexb-2 \
-
fate-h264_mp4toannexb_ticket5927 \
-
fate-h264_mp4toannexb_ticket5927_2 \
+
+FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF
EXTRACT_EXTRADATA_BSF) += fate-h264_mp4toannexb_ticket5927 \
+
fate-h264_mp4toannexb_ticket5927_2
FATE_H264-$(call DEMMUX, H264, MOV, DTS2PTS_BSF) += fate-h264-bsf-dts2pts
@@ -237,7 +238,8 @@ FATE_H264-$(call FRAMECRC, MATROSKA, H264) +=
fate-h264-direct-bff
FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580
FATE_H264-$(call FRAMECRC, MXF, H264, PCM_S24LE_DECODER SCALE_FILTER
ARESAMPLE_FILTER) += fate-h264-xavc-4389
FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-attachment-631
-FATE_H264-$(call FRAMECRC, MPEGTS, H264, H264_PARSER MP3_DECODER SCALE_FILTER
ARESAMPLE_FILTER) += fate-h264-skip-nokey fate-h264-skip-nointra
+FATE_H264-$(call FRAMECRC, MPEGTS, H264, H264_PARSER MP3_DECODER SCALE_FILTER
ARESAMPLE_FILTER) += fate-h264-skip-nokey
+FATE_H264-$(call FRAMECRC, MPEGTS, H264, H264_PARSER MP3_DECODER SCALE_FILTER
ARESAMPLE_FILTER EXTRACT_EXTRADATA_BSF) += fate-h264-skip-nointra
FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames
FATE_H264_FFPROBE-$(call PARSERDEMDEC, H264, H264, H264) += fate-h264-afd
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 9e6fd72618..285348cc74 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -229,7 +229,7 @@ tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) |
tests/data
$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \
-i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c
copy -flags +bitexact $(TARGET_PATH)/$@ -y 2>/dev/null
-FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_PARSER
HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb
+FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_PARSER
HEVC_MP4TOANNEXB_BSF EXTRACT_EXTRADATA_BSF MOV_MUXER HEVC_MUXER) +=
fate-hevc-bsf-mp4toannexb
fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov
fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov
-c:v copy -fflags +bitexact -f hevc
fate-hevc-bsf-mp4toannexb: CMP = oneline
@@ -249,7 +249,7 @@ fate-hevc-monochrome-crop: CMD = probeframes -show_entries
frame=width,height:st
FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC) +=
fate-hevc-monochrome-crop
fate-hevc-afd-tc-sei: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -bitexact
-show_entries frame_side_data_list -select_streams v
$(TARGET_SAMPLES)/mpegts/loewe.ts
-FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC) +=
fate-hevc-afd-tc-sei
+FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC,
EXTRACT_EXTRADATA_BSF) += fate-hevc-afd-tc-sei
fate-hevc-hdr10-plus-metadata: CMD = probeframes -show_entries
frame=side_data_list $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc
FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-hdr10-plus-metadata
diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
index bc202ee5f3..89181dee42 100644
--- a/tests/fate/lavf-container.mak
+++ b/tests/fate/lavf-container.mak
@@ -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
MOV_MUXER) += av1.mp4
-FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_DECODER AV1_PARSER
MATROSKA_MUXER) += av1.mkv
+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 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 MOV_MUXER)
+= h264.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, MOV_DEMUXER MOV_MUXER)
+= mv_hevc.mov
-FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER MOV_MUXER)
+= vvc.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER
EXTRACT_EXTRADATA_BSF MOV_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/segment.mak b/tests/fate/segment.mak
index 88866fc9bb..b2f61681a4 100644
--- a/tests/fate/segment.mak
+++ b/tests/fate/segment.mak
@@ -35,7 +35,7 @@ tests/data/adts-to-mkv-cated-%.mkv:
tests/data/adts-to-mkv-header.mkv tests/data
FATE_SEGMENT += fate-segment-mp4-to-ts
fate-segment-mp4-to-ts: tests/data/mp4-to-ts.m3u8
fate-segment-mp4-to-ts: CMD = framecrc -flags +bitexact -i
$(TARGET_PATH)/tests/data/mp4-to-ts.m3u8 -c copy
-FATE_SEGMENT-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF MPEGTS_MUXER
MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += fate-segment-mp4-to-ts
+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
FATE_SEGMENT += fate-segment-adts-to-mkv
fate-segment-adts-to-mkv: tests/data/adts-to-mkv.m3u8
--
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".
