fate: add concat demuxer tests

Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>

fate: add concat demuxer tests
Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
a01046c9 · Marton Balint · 7ad698e2 · a01046c9 · a01046c9 · a01046c9
Commit a01046c9 authored Oct 24, 2015 by Marton Balint
11 changed files
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -113,6 +113,7 @@ include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/bmp.mak
 include $(SRC_PATH)/tests/fate/cdxl.mak
 include $(SRC_PATH)/tests/fate/checkasm.mak
+include $(SRC_PATH)/tests/fate/concatdec.mak
 include $(SRC_PATH)/tests/fate/cover-art.mak
 include $(SRC_PATH)/tests/fate/demux.mak
 include $(SRC_PATH)/tests/fate/dfa.mak

--- a/tests/extended.ffconcat
+++ b/tests/extended.ffconcat
+ffconcat version 1.0
+
+file      %SRCFILE%
+
+file      %SRCFILE%
+duration  1
+file_packet_metadata dummy=1
+
+file      %SRCFILE%
+inpoint   00:00.00
+outpoint  00:00.04
+
+file      %SRCFILE%
+inpoint   00:00.04
+outpoint  00:00.08
+
+file      %SRCFILE%
+inpoint   00:00.08
+outpoint  00:00.12
+
+file      %SRCFILE%
+inpoint   00:00.12
+outpoint  00:00.16
+
+file      %SRCFILE%
+inpoint   00:00.16
+outpoint  00:00.20
+
+file      %SRCFILE%
+inpoint   00:00.20
+outpoint  00:00.24
+
+file      %SRCFILE%
+inpoint   00:00.24
+outpoint  00:00.28
+
+file      %SRCFILE%
+inpoint   00:00.28
+outpoint  00:00.32
+
+file      %SRCFILE%
+inpoint   00:00.32
+outpoint  00:00.36
+
+file      %SRCFILE%
+inpoint   00:00.36
+outpoint  00:00.40
+
+file      %SRCFILE%
+inpoint   00:00.40
+outpoint  00:00.44
+
+file      %SRCFILE%
+inpoint   00:00.44
+outpoint  00:00.48
+
+file      %SRCFILE%
+inpoint   00:00.48
+outpoint  00:00.52
+
+file      %SRCFILE%
+inpoint   00:00.52
+outpoint  00:00.56
+
+file      %SRCFILE%
+inpoint   00:00.56
+outpoint  00:00.60
+
+file      %SRCFILE%
+inpoint   00:00.60
+outpoint  00:00.64
+
+file      %SRCFILE%
+inpoint   00:00.64
+outpoint  00:00.68
+
+file      %SRCFILE%
+inpoint   00:00.68
+outpoint  00:00.72
+
+file      %SRCFILE%
+inpoint   00:00.72
+outpoint  00:00.76
+
+file      %SRCFILE%
+inpoint   00:00.76
+outpoint  00:00.80
+
+file      %SRCFILE%
+inpoint   00:00.80
+outpoint  00:00.84
+
+file      %SRCFILE%
+inpoint   00:00.84
+outpoint  00:00.88
+
+file      %SRCFILE%
+inpoint   00:00.88
+outpoint  00:00.92
+
+file      %SRCFILE%
+inpoint   00:00.92
+outpoint  00:00.96
+
+file      %SRCFILE%
+inpoint   00:00.96
+outpoint  00:01.00
+
+file      %SRCFILE%
+outpoint  00:00.40
+
+file      %SRCFILE%
+inpoint   00:00.40
+
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -249,6 +249,26 @@ gapless(){
    do_md5sum $decfile3
 }

+concat(){
+    template=$1
+    sample=$(target_path $2)
+    mode=$3
+    extra_args=$4
+
+    concatfile="${outdir}/${test}.ffconcat"
+    packetfile="${outdir}/${test}.ffprobe"
+    cleanfiles="$concatfile $packetfile"
+
+    awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile
+
+    if [ "$mode" = "md5" ]; then
+      run ffprobe${PROGSUF} -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile > $packetfile
+      do_md5sum $packetfile
+    else
+      run ffprobe${PROGSUF} -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
+    fi
+}
+
 mkdir -p "$outdir"

 # Disable globbing: command arguments may contain globbing characters and

--- a/tests/fate/concatdec.mak
+++ b/tests/fate/concatdec.mak
+FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)   += mxf
+FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)   += mxf_d10
+
+FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS)      += ts
+
+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
+
+$(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 tests/data/lavf/lavf.$(D)))
+FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes:%=fate-concat-demuxer-simple1-lavf-%)
+
+$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D)))
+$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple2.ffconcat tests/data/lavf/lavf.$(D)))
+FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes:%=fate-concat-demuxer-simple2-lavf-%)
+
+$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D)))
+$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): CMD = concat $(SRC_PATH)/tests/extended.ffconcat tests/data/lavf/lavf.$(D) md5))
+FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes:%=fate-concat-demuxer-extended-lavf-%)
+
+FATE-$(CONFIG_FFPROBE) += $(FATE_CONCAT_DEMUXER-yes)
--- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
+aa6477bcaef182919ac0c08ed74b32a1 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
--- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
+651eca7722187ff6836f55826bb1d110 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
--- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
+video|0|0|0.000000|-1|-0.040000|1|0.040000|N/A|N/A|24801|6144|K
+audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|3840|31232|K
+video|0|3|0.120000|0|0.000000|1|0.040000|N/A|N/A|16743|35840|_
+audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|3840|52736|K
+video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|13812|57344|_
+audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|3840|71680|K
+video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|13607|76288|_
+audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|3840|90112|K
+video|0|6|0.240000|3|0.120000|1|0.040000|N/A|N/A|16158|94720|_
+audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|3840|111104|K
+video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|13943|115712|_
+audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|3840|130048|K
+video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|11223|134656|_
+audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|3840|145920|K
+video|0|9|0.360000|6|0.240000|1|0.040000|N/A|N/A|20298|150528|_
+audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|3840|171008|K
+video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|13341|175616|_
+audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|3840|189440|K
+video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|12362|194048|_
+audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|3840|206848|K
+video|0|12|0.480000|9|0.360000|1|0.040000|N/A|N/A|24786|211456|K
+audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|3840|236544|K
+video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|13377|241152|_
+audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|3840|254976|K
+video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|15624|259584|_
+audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|3840|275456|K
+video|0|15|0.600000|12|0.480000|1|0.040000|N/A|N/A|22597|280064|_
+audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|3840|303104|K
+video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|15028|307712|_
+audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|3840|323072|K
+video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|14014|327680|_
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|342016|K
+video|0|18|0.720000|15|0.600000|1|0.040000|N/A|N/A|20731|346624|_
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|367616|K
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|11946|372224|_
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|384512|K
+video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|14464|389120|_
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|403968|K
+video|0|21|0.840000|18|0.720000|1|0.040000|N/A|N/A|16189|408576|_
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|424960|K
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|10524|429568|_
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|440320|K
+video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|10599|444928|_
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|455680|K
+video|0|24|0.960000|21|0.840000|1|0.040000|N/A|N/A|24711|460288|K
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|485376|K
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|10840|489984|_
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|501248|K
+video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|13350|505856|_
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|519680|K
+video|0|17|0.680000|14|0.560000|1|0.040000|N/A|N/A|24786|211456|K
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|236544|K
+video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|13377|241152|_
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|254976|K
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|15624|259584|_
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|275456|K
+video|0|20|0.800000|17|0.680000|1|0.040000|N/A|N/A|22597|280064|_
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|303104|K
+video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|15028|307712|_
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|323072|K
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|14014|327680|_
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|342016|K
+video|0|23|0.920000|20|0.800000|1|0.040000|N/A|N/A|20731|346624|_
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|367616|K
+video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|11946|372224|_
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|384512|K
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|14464|389120|_
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|403968|K
+video|0|26|1.040000|23|0.920000|1|0.040000|N/A|N/A|16189|408576|_
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|424960|K
+video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|10524|429568|_
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|440320|K
+video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|10599|444928|_
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|455680|K
+video|0|29|1.160000|26|1.040000|1|0.040000|N/A|N/A|24711|460288|K
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|485376|K
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|10840|489984|_
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|501248|K
+video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|13350|505856|_
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|519680|K
+video|0|25|1.000000|24|0.960000|1|0.040000|N/A|N/A|24801|6144|K|1
+Strings Metadata|8
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|31232|K|1
+Strings Metadata|8
+video|0|28|1.120000|25|1.000000|1|0.040000|N/A|N/A|16743|35840|_|1
+Strings Metadata|8
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|52736|K|1
+Strings Metadata|8
+video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|13812|57344|_|1
+Strings Metadata|8
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|71680|K|1
+Strings Metadata|8
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|13607|76288|_|1
+Strings Metadata|8
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|90112|K|1
+Strings Metadata|8
+video|0|31|1.240000|28|1.120000|1|0.040000|N/A|N/A|16158|94720|_|1
+Strings Metadata|8
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|111104|K|1
+Strings Metadata|8
+video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|13943|115712|_|1
+Strings Metadata|8
+audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|3840|130048|K|1
+Strings Metadata|8
+video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|11223|134656|_|1
+Strings Metadata|8
+audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|3840|145920|K|1
+Strings Metadata|8
+video|0|34|1.360000|31|1.240000|1|0.040000|N/A|N/A|20298|150528|_|1
+Strings Metadata|8
+audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|3840|171008|K|1
+Strings Metadata|8
+video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|13341|175616|_|1
+Strings Metadata|8
+audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|3840|189440|K|1
+Strings Metadata|8
+video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|12362|194048|_|1
+Strings Metadata|8
+audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|206848|K|1
+Strings Metadata|8
+video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|211456|K|1
+Strings Metadata|8
+0|mpeg2video|MPEG-2 video|Main|video|1/50|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|00:00:00:00|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|104857200|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
+1|pcm_s16le|PCM signed 16-bit little-endian|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
--- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
+video|0|0|0.000000|0|0.000000|1|0.040000|N/A|N/A|150000|6144|K
+audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|7680|156672|K
+video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|150000|219136|K
+audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|7680|369664|K
+video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|150000|432128|K
+audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|7680|582656|K
+video|0|3|0.120000|3|0.120000|1|0.040000|N/A|N/A|150000|645120|K
+audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|7680|795648|K
+video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|150000|858112|K
+audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|7680|1008640|K
+video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|150000|1071104|K
+audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|7680|1221632|K
+video|0|6|0.240000|6|0.240000|1|0.040000|N/A|N/A|150000|1284096|K
+audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|7680|1434624|K
+video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|150000|1497088|K
+audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|7680|1647616|K
+video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|150000|1710080|K
+audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|7680|1860608|K
+video|0|9|0.360000|9|0.360000|1|0.040000|N/A|N/A|150000|1923072|K
+audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|7680|2073600|K
+video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|150000|2136064|K
+audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|7680|2286592|K
+video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|150000|2349056|K
+audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|7680|2499584|K
+video|0|12|0.480000|12|0.480000|1|0.040000|N/A|N/A|150000|2562048|K
+audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|7680|2712576|K
+video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|150000|2775040|K
+audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|7680|2925568|K
+video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|150000|2988032|K
+audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|7680|3138560|K
+video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|150000|3201024|K
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|7680|3351552|K
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|150000|3414016|K
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|7680|3564544|K
+video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|150000|3627008|K
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|7680|3777536|K
+video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|150000|3840000|K
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|7680|3990528|K
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|150000|4052992|K
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|7680|4203520|K
+video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|150000|4265984|K
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|7680|4416512|K
+video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|150000|4478976|K
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|7680|4629504|K
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|150000|4691968|K
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|7680|4842496|K
+video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|150000|4904960|K
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|7680|5055488|K
+video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|150000|5117952|K
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|7680|5268480|K
+video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|150000|4265984|K
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|7680|4416512|K
+video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|150000|4478976|K
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|7680|4629504|K
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|150000|4691968|K
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|7680|4842496|K
+video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|150000|4904960|K
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|7680|5055488|K
+video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|150000|5117952|K
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|7680|5268480|K
+video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|150000|1071104|K|1
+Strings Metadata|8
+audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|7680|1221632|K|1
+Strings Metadata|8
+video|0|31|1.240000|31|1.240000|1|0.040000|N/A|N/A|150000|1284096|K|1
+Strings Metadata|8
+audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|7680|1434624|K|1
+Strings Metadata|8
+video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|150000|1497088|K|1
+Strings Metadata|8
+audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|7680|1647616|K|1
+Strings Metadata|8
+video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|150000|1710080|K|1
+Strings Metadata|8
+audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|7680|1860608|K|1
+Strings Metadata|8
+video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1923072|K|1
+Strings Metadata|8
+audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2073600|K|1
+Strings Metadata|8
+0|mpeg2video|MPEG-2 video|4:2:2|video|1/50|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|00:00:00:00|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|30000000|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
+1|pcm_s16le|PCM signed 16-bit little-endian|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
--- a/tests/ref/fate/concat-demuxer-simple2-lavf-ts
+++ b/tests/ref/fate/concat-demuxer-simple2-lavf-ts
+video|1|982|0.010911|-2618|-0.029089|3600|0.040000|N/A|N/A|24801|564|K
+video|1|4582|0.050911|982|0.010911|3600|0.040000|N/A|N/A|16429|27072|_
+video|1|8182|0.090911|4582|0.050911|3600|0.040000|N/A|N/A|14508|44932|_
+video|1|11782|0.130911|8182|0.090911|3600|0.040000|N/A|N/A|12622|60536|_
+video|1|15382|0.170911|11782|0.130911|3600|0.040000|N/A|N/A|13393|74260|_
+video|1|18982|0.210911|15382|0.170911|3600|0.040000|N/A|N/A|13092|88924|_
+video|1|22582|0.250911|18982|0.210911|3600|0.040000|N/A|N/A|12755|102836|_
+video|1|26182|0.290911|22582|0.250911|3600|0.040000|N/A|N/A|12023|116748|_
+audio|0|0|0.000000|0|0.000000|2351|0.026122|N/A|N/A|208|159988|K
+audio|0|2351|0.026122|2351|0.026122|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|4702|0.052244|4702|0.052244|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|7053|0.078367|7053|0.078367|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|9404|0.104489|9404|0.104489|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|11755|0.130611|11755|0.130611|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|14106|0.156733|14106|0.156733|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|16457|0.182856|16457|0.182856|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|18808|0.208978|18808|0.208978|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|21159|0.235100|21159|0.235100|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|23510|0.261222|23510|0.261222|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|25861|0.287344|25861|0.287344|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|28212|0.313467|28212|0.313467|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|30563|0.339589|30563|0.339589|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|29782|0.330911|26182|0.290911|3600|0.040000|N/A|N/A|14098|130096|_
+video|1|33382|0.370911|29782|0.330911|3600|0.040000|N/A|N/A|13329|145324|_
+video|1|36982|0.410911|33382|0.370911|3600|0.040000|N/A|N/A|12135|162996|_
+video|1|40582|0.450911|36982|0.410911|3600|0.040000|N/A|N/A|12282|176344|_
+video|1|44182|0.490911|40582|0.450911|3600|0.040000|N/A|N/A|24786|189692|K
+video|1|47782|0.530911|44182|0.490911|3600|0.040000|N/A|N/A|17440|216388|_
+video|1|51382|0.570911|47782|0.530911|3600|0.040000|N/A|N/A|15019|235000|_
+video|1|54982|0.610911|51382|0.570911|3600|0.040000|N/A|N/A|13449|251356|_
+video|1|58582|0.650911|54982|0.610911|3600|0.040000|N/A|N/A|12398|266020|_
+video|1|62182|0.690911|58582|0.650911|3600|0.040000|N/A|N/A|13455|279744|_
+audio|0|32915|0.365722|32915|0.365722|2351|0.026122|N/A|N/A|209|322608|K
+audio|0|35266|0.391844|35266|0.391844|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|37617|0.417967|37617|0.417967|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|39968|0.444089|39968|0.444089|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|42319|0.470211|42319|0.470211|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|44670|0.496333|44670|0.496333|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|47021|0.522456|47021|0.522456|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|49372|0.548578|49372|0.548578|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|51723|0.574700|51723|0.574700|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|54074|0.600822|54074|0.600822|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|56425|0.626944|56425|0.626944|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|58776|0.653067|58776|0.653067|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|61127|0.679189|61127|0.679189|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|63478|0.705311|63478|0.705311|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|65782|0.730911|62182|0.690911|3600|0.040000|N/A|N/A|13836|294408|_
+video|1|69382|0.770911|65782|0.730911|3600|0.040000|N/A|N/A|12163|309448|_
+video|1|72982|0.810911|69382|0.770911|3600|0.040000|N/A|N/A|12692|325992|_
+video|1|76582|0.850911|72982|0.810911|3600|0.040000|N/A|N/A|10824|339528|_
+video|1|80182|0.890911|76582|0.850911|3600|0.040000|N/A|N/A|11286|351372|_
+audio|0|65829|0.731433|65829|0.731433|2351|0.026122|N/A|N/A|209|404576|K
+audio|0|68180|0.757556|68180|0.757556|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|70531|0.783678|70531|0.783678|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|72882|0.809800|72882|0.809800|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|75233|0.835922|75233|0.835922|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|77584|0.862044|77584|0.862044|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|79935|0.888167|79935|0.888167|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|82286|0.914289|82286|0.914289|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|84637|0.940411|84637|0.940411|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|86988|0.966533|86988|0.966533|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|89339|0.992656|89339|0.992656|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|83782|0.930911|80182|0.890911|3600|0.040000|N/A|N/A|12678|363592|_
+video|1|87382|0.970911|83782|0.930911|3600|0.040000|N/A|N/A|24711|377880|K
+video|1|91964|1.021822|88364|0.981822|3600|0.040000|N/A|N/A|24801|564|K
+video|1|95564|1.061822|91964|1.021822|3600|0.040000|N/A|N/A|16429|27072|_
+video|1|99164|1.101822|95564|1.061822|3600|0.040000|N/A|N/A|14508|44932|_
+video|1|102764|1.141822|99164|1.101822|3600|0.040000|N/A|N/A|12622|60536|_
+video|1|106364|1.181822|102764|1.141822|3600|0.040000|N/A|N/A|13393|74260|_
+video|1|109964|1.221822|106364|1.181822|3600|0.040000|N/A|N/A|13092|88924|_
+video|1|113564|1.261822|109964|1.221822|3600|0.040000|N/A|N/A|12755|102836|_
+video|1|117164|1.301822|113564|1.261822|3600|0.040000|N/A|N/A|12023|116748|_
+audio|0|90982|1.010911|90982|1.010911|2351|0.026122|N/A|N/A|208|159988|K
+audio|0|93333|1.037033|93333|1.037033|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|95684|1.063156|95684|1.063156|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|98035|1.089278|98035|1.089278|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|100386|1.115400|100386|1.115400|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|102737|1.141522|102737|1.141522|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|105088|1.167644|105088|1.167644|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|107439|1.193767|107439|1.193767|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|109790|1.219889|109790|1.219889|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|112141|1.246011|112141|1.246011|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|114492|1.272133|114492|1.272133|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|116843|1.298256|116843|1.298256|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|119194|1.324378|119194|1.324378|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|121545|1.350500|121545|1.350500|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|120764|1.341822|117164|1.301822|3600|0.040000|N/A|N/A|14098|130096|_
+video|1|124364|1.381822|120764|1.341822|3600|0.040000|N/A|N/A|13329|145324|_
+video|1|127964|1.421822|124364|1.381822|3600|0.040000|N/A|N/A|12135|162996|_
+video|1|131564|1.461822|127964|1.421822|3600|0.040000|N/A|N/A|12282|176344|_
+video|1|135164|1.501822|131564|1.461822|3600|0.040000|N/A|N/A|24786|189692|K
+video|1|138764|1.541822|135164|1.501822|3600|0.040000|N/A|N/A|17440|216388|_
+video|1|142364|1.581822|138764|1.541822|3600|0.040000|N/A|N/A|15019|235000|_
+video|1|145964|1.621822|142364|1.581822|3600|0.040000|N/A|N/A|13449|251356|_
+video|1|149564|1.661822|145964|1.621822|3600|0.040000|N/A|N/A|12398|266020|_
+video|1|153164|1.701822|149564|1.661822|3600|0.040000|N/A|N/A|13455|279744|_
+audio|0|123897|1.376633|123897|1.376633|2351|0.026122|N/A|N/A|209|322608|K
+audio|0|126248|1.402756|126248|1.402756|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|128599|1.428878|128599|1.428878|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|130950|1.455000|130950|1.455000|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|133301|1.481122|133301|1.481122|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|135652|1.507244|135652|1.507244|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|138003|1.533367|138003|1.533367|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|140354|1.559489|140354|1.559489|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|142705|1.585611|142705|1.585611|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|145056|1.611733|145056|1.611733|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|147407|1.637856|147407|1.637856|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|149758|1.663978|149758|1.663978|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|152109|1.690100|152109|1.690100|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|154460|1.716222|154460|1.716222|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|156764|1.741822|153164|1.701822|3600|0.040000|N/A|N/A|13836|294408|_
+video|1|160364|1.781822|156764|1.741822|3600|0.040000|N/A|N/A|12163|309448|_
+video|1|163964|1.821822|160364|1.781822|3600|0.040000|N/A|N/A|12692|325992|_
+video|1|167564|1.861822|163964|1.821822|3600|0.040000|N/A|N/A|10824|339528|_
+video|1|171164|1.901822|167564|1.861822|3600|0.040000|N/A|N/A|11286|351372|_
+audio|0|156811|1.742344|156811|1.742344|2351|0.026122|N/A|N/A|209|404576|K
+audio|0|159162|1.768467|159162|1.768467|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|161513|1.794589|161513|1.794589|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|163864|1.820711|163864|1.820711|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|166215|1.846833|166215|1.846833|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|168566|1.872956|168566|1.872956|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|170917|1.899078|170917|1.899078|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|173268|1.925200|173268|1.925200|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|175619|1.951322|175619|1.951322|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|177970|1.977444|177970|1.977444|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|180321|2.003567|180321|2.003567|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|174764|1.941822|171164|1.901822|3600|0.040000|N/A|N/A|12678|363592|_
+video|1|178364|1.981822|174764|1.941822|3600|0.040000|N/A|N/A|24711|377880|K
+video|1|139582|1.550911|135982|1.510911|3600|0.040000|N/A|N/A|12692|325992|_
+video|1|143182|1.590911|139582|1.550911|3600|0.040000|N/A|N/A|10824|339528|_
+video|1|146782|1.630911|143182|1.590911|3600|0.040000|N/A|N/A|11286|351372|_
+audio|0|132429|1.471433|132429|1.471433|2351|0.026122|N/A|N/A|209|404576|K
+audio|0|134780|1.497556|134780|1.497556|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|137131|1.523678|137131|1.523678|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|139482|1.549800|139482|1.549800|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|141833|1.575922|141833|1.575922|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|144184|1.602044|144184|1.602044|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|146535|1.628167|146535|1.628167|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|148886|1.654289|148886|1.654289|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|151237|1.680411|151237|1.680411|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|153588|1.706533|153588|1.706533|2351|0.026122|N/A|N/A|209|N/A|K
+audio|0|155939|1.732656|155939|1.732656|2351|0.026122|N/A|N/A|209|N/A|K
+video|1|150382|1.670911|146782|1.630911|3600|0.040000|N/A|N/A|12678|363592|_
+video|1|153982|1.710911|150382|1.670911|3600|0.040000|N/A|N/A|24711|377880|K
+video|1|161182|1.790911|157582|1.750911|3600|0.040000|N/A|N/A|12135|162996|_
+video|1|164782|1.830911|161182|1.790911|3600|0.040000|N/A|N/A|12282|176344|_
+video|1|168382|1.870911|164782|1.830911|3600|0.040000|N/A|N/A|24786|189692|K
+video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17440|216388|_
+video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15019|235000|_
+0|mp2|MP2 (MPEG audio layer 2)|unknown|audio|1/44100|[3][0][0][0]|0x0003|s16p|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|0
+1|mpeg2video|MPEG-2 video|Main|video|1/50|[2][0][0][0]|0x0002|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|00:00:00:00|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|104857200|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|0
--- a/tests/simple1.ffconcat
+++ b/tests/simple1.ffconcat
+ffconcat version 1.0
+
+file      %SRCFILE%
+
+file      %SRCFILE%
+inpoint   00:00.80
+
+file      %SRCFILE%
+inpoint   00:00.20
+outpoint  00:00.40
+file_packet_metadata dummy=1
+
--- a/tests/simple2.ffconcat
+++ b/tests/simple2.ffconcat
+ffconcat version 1.0
+
+stream    0
+exact_stream_id 257
+stream    1
+exact_stream_id 256
+
+file      %SRCFILE%
+
+file      %SRCFILE%
+duration  0.5
+
+file      %SRCFILE%
+inpoint   00:02.20
+
+file      %SRCFILE%
+inpoint   00:01.80
+outpoint  00:02.00
+