On 4/28/2016 6:06 AM, Nicolas George wrote: > Signed-off-by: Nicolas George <geo...@nsup.org> > --- > 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"
I think this needs to be $(TARGET_SAMPLES). > +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) You should be able to simplify this using FATE_FFPROBE and FATE_SAMPLES_FFPROBE. It would also remove the need to specify the ffprobe$(PROGSSUF)$(EXESUF) dependency for all these tests. > 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 Fails here on mingw-w64 using msys2 (The other concat tests all pass). TEST concat-demuxer-convert-lavf-h264 /ffmpeg/src/tests/fate-run.sh fate-concat-demuxer-convert-lavf-h264 "../samples" "" "/ffmpeg/build" 'concat /ffmpeg/src/tests/convert.ffconcat ../samples/h264/interlaced_crop.mp4 md5 "-show_data_hash crc32"' '' '' '' '1' '' '' '' '' '' '' '' '' /ffmpeg/build/ffprobe -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 -show_data_hash crc32 tests/data/fate/concat-demuxer-convert-lavf-h264.ffconcat --- /ffmpeg/src/tests/ref/fate/concat-demuxer-convert-lavf-h264 2016-04-28 11:29:18.243034800 -0300 +++ tests/data/fate/concat-demuxer-convert-lavf-h264 2016-04-28 11:43:16.148993800 -0300 @@ -1 +1 @@ -0a8b824a133a8ef220196801f70bb792 *tests/data/fate/concat-demuxer-convert-lavf-h264.ffprobe +d41d8cd98f00b204e9800998ecf8427e *tests/data/fate/concat-demuxer-convert-lavf-h264.ffprobe Test concat-demuxer-convert-lavf-h264 failed. Look at tests/data/fate/concat-demuxer-convert-lavf-h264.err for details. /ffmpeg/src/tests/Makefile:211: recipe for target 'fate-concat-demuxer-convert-lavf-h264' failed make: *** [fate-concat-demuxer-convert-lavf-h264] Error 1 TEST concat-demuxer-convert-lavf-h264-noconv /ffmpeg/src/tests/fate-run.sh fate-concat-demuxer-convert-lavf-h264-noconv "../samples" "" "/ffmpeg/build" 'concat /ffmpeg/src/tests/convert.ffconcat ../samples/h264/interlaced_crop.mp4 md5 "-show_data_hash crc32 -auto_convert 0"' '' '' '' '1' '' '' '' '' '' '' '' '' /ffmpeg/build/ffprobe -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 -show_data_hash crc32 -auto_convert 0 tests/data/fate/concat-demuxer-convert-lavf-h264-noconv.ffconcat --- /ffmpeg/src/tests/ref/fate/concat-demuxer-convert-lavf-h264-noconv 2016-04-28 11:29:18.243034800 -0300 +++ tests/data/fate/concat-demuxer-convert-lavf-h264-noconv 2016-04-28 11:43:36.133833100 -0300 @@ -1 +1 @@ -377ea72196f9c870d3857cd5afc114a2 *tests/data/fate/concat-demuxer-convert-lavf-h264-noconv.ffprobe +d41d8cd98f00b204e9800998ecf8427e *tests/data/fate/concat-demuxer-convert-lavf-h264-noconv.ffprobe Test concat-demuxer-convert-lavf-h264-noconv failed. Look at tests/data/fate/concat-demuxer-convert-lavf-h264-noconv.err for details. /ffmpeg/src/tests/Makefile:211: recipe for target 'fate-concat-demuxer-convert-lavf-h264-noconv' failed make: *** [fate-concat-demuxer-convert-lavf-h264-noconv] Error 1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
