Signed-off-by: Nicolas George <[email protected]>
---
tests/convert.ffconcat | 3 +++
tests/fate/concatdec.mak | 9 +++++++++
tests/ref/fate/concat-demuxer-convert-lavf-h264 | 1 +
tests/ref/fate/concat-demuxer-convert-lavf-h264-noconv | 1 +
4 files changed, 14 insertions(+)
create mode 100644 tests/convert.ffconcat
create mode 100644 tests/ref/fate/concat-demuxer-convert-lavf-h264
create mode 100644 tests/ref/fate/concat-demuxer-convert-lavf-h264-noconv
diff --git a/tests/convert.ffconcat b/tests/convert.ffconcat
new file mode 100644
index 0000000..8f7d64b
--- /dev/null
+++ b/tests/convert.ffconcat
@@ -0,0 +1,3 @@
+ffconcat version 1.0
+file %SRCFILE%
+file %SRCFILE%
diff --git a/tests/fate/concatdec.mak b/tests/fate/concatdec.mak
index 988559d..2870bd1 100644
--- a/tests/fate/concatdec.mak
+++ b/tests/fate/concatdec.mak
@@ -6,6 +6,9 @@ FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-$(call ENCDEC2, MPEG2VIDEO,
MP2, MPEGTS) +
FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)
+= mxf
FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)
+= mxf_d10
+FATE_CONCAT_DEMUXER_CONVERT_LAVF-$(call ALLYES, MOV_DEMUXER,
H264_MP4TOANNEXB_BSF) += h264
+FATE_CONCAT_DEMUXER_CONVERT_LAVF-$(call ALLYES, MOV_DEMUXER)
+= h264-noconv
+
$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval
fate-concat-demuxer-simple1-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF)
fate-lavf-$(D)))
$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval
fate-concat-demuxer-simple1-lavf-$(D): CMD = concat
$(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D)))
FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) +=
$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes:%=fate-concat-demuxer-simple1-lavf-%)
@@ -18,4 +21,10 @@ $(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval
fate-concat-demuxer-
$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval
fate-concat-demuxer-extended-lavf-$(D): CMD = concat
$(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5))
FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) +=
$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes:%=fate-concat-demuxer-extended-lavf-%)
+$(foreach D,$(FATE_CONCAT_DEMUXER_CONVERT_LAVF-yes),$(eval
fate-concat-demuxer-convert-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF)))
+fate-concat-demuxer-convert-lavf-h264: CMD = concat
$(SRC_PATH)/tests/convert.ffconcat $(SAMPLES)/h264/interlaced_crop.mp4 md5
"-show_data_hash crc32"
+fate-concat-demuxer-convert-lavf-h264-noconv: CMD = concat
$(SRC_PATH)/tests/convert.ffconcat $(SAMPLES)/h264/interlaced_crop.mp4 md5
"-show_data_hash crc32 -auto_convert 0"
+FATE_EXTERN_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) +=
$(FATE_CONCAT_DEMUXER_CONVERT_LAVF-yes:%=fate-concat-demuxer-convert-lavf-%)
+
FATE-$(CONFIG_FFPROBE) += $(FATE_CONCAT_DEMUXER-yes)
+FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_EXTERN_CONCAT_DEMUXER-yes)
diff --git a/tests/ref/fate/concat-demuxer-convert-lavf-h264
b/tests/ref/fate/concat-demuxer-convert-lavf-h264
new file mode 100644
index 0000000..73d7a45
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-convert-lavf-h264
@@ -0,0 +1 @@
+0a8b824a133a8ef220196801f70bb792
*tests/data/fate/concat-demuxer-convert-lavf-h264.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-convert-lavf-h264-noconv
b/tests/ref/fate/concat-demuxer-convert-lavf-h264-noconv
new file mode 100644
index 0000000..1caa663
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-convert-lavf-h264-noconv
@@ -0,0 +1 @@
+377ea72196f9c870d3857cd5afc114a2
*tests/data/fate/concat-demuxer-convert-lavf-h264-noconv.ffprobe
--
2.8.0.rc3
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
