Message ID | 1473971779-27524-6-git-send-email-isasi@google.com |
---|---|
State | Accepted |
Commit | 6a2cbf901461c4d2766618343e6f57739500393d |
Headers | show |
ping On Thu, Sep 15, 2016 at 1:36 PM, Sasi Inguva <isasi@google.com> wrote: > Signed-off-by: Sasi Inguva <isasi@google.com> > --- > ffprobe.c | 3 +- > tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- > .../ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- > tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 242 > ++++++++--------- > tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +++++----- > tests/ref/fate/concat-demuxer-simple2-lavf-ts | 298 > ++++++++++----------- > tests/ref/fate/ffprobe_compact | 28 +- > tests/ref/fate/ffprobe_csv | 28 +- > tests/ref/fate/ffprobe_default | 28 +- > tests/ref/fate/ffprobe_flat | 28 +- > tests/ref/fate/ffprobe_ini | 28 +- > tests/ref/fate/ffprobe_json | 28 +- > tests/ref/fate/ffprobe_xml | 28 +- > 13 files changed, 442 insertions(+), 441 deletions(-) > > diff --git a/ffprobe.c b/ffprobe.c > index 657867d..e64c66e 100644 > --- a/ffprobe.c > +++ b/ffprobe.c > @@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile > *ifile, AVPacket *pkt, int p > print_val("size", pkt->size, unit_byte_str); > if (pkt->pos != -1) print_fmt ("pos", "%"PRId64, pkt->pos); > else print_str_opt("pos", "N/A"); > - print_fmt("flags", "%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : > '_'); > + print_fmt("flags", "%c%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : > '_', > + pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_'); > > if (pkt->side_data_elems) { > int size; > diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf > b/tests/ref/fate/concat-demuxer-extended-lavf-mxf > index b894938..f7905aa 100644 > --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf > +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf > @@ -1 +1 @@ > -0aa1ca6ff6e2e5aa926454d22fdaecd5 *tests/data/fate/concat- > demuxer-extended-lavf-mxf.ffprobe > +21eb3a629ff504b55c93a66879a31362 *tests/data/fate/concat- > demuxer-extended-lavf-mxf.ffprobe > diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 > b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 > index b378a2d..0c49f1f 100644 > --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 > +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 > @@ -1 +1 @@ > -14c2b8d8f82f261c9627b33c481c0e8c *tests/data/fate/concat- > demuxer-extended-lavf-mxf_d10.ffprobe > +67a03ad49f1bd17131f751313639b61e *tests/data/fate/concat- > demuxer-extended-lavf-mxf_d10.ffprobe > diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf > b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf > index 3fc7957..6bba76a 100644 > --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf > +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf > @@ -1,124 +1,124 @@ > -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 > +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|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1| > 1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|N/A|1|N/ > A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0| > 0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300 > 000000000000000000000000000000000001 > 1|pcm_s16le|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 > diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 > b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 > index 0ff1b04..75cac84 100644 > --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 > +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 > @@ -1,82 +1,82 @@ > -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 > +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 > +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 > +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 > +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 > +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 > +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 > +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 > +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 > +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 > +audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/ > A|7680|2073600|K_|1 > Strings Metadata|8 > 0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0| > 1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown| > topleft|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A| > 30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0| > 0x060A2B340101010501010D001300000000000000000000000000000000000001 > 1|pcm_s16le|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 > diff --git a/tests/ref/fate/concat-demuxer-simple2-lavf-ts > b/tests/ref/fate/concat-demuxer-simple2-lavf-ts > index 33337cf..4dfed4d 100644 > --- a/tests/ref/fate/concat-demuxer-simple2-lavf-ts > +++ b/tests/ref/fate/concat-demuxer-simple2-lavf-ts > @@ -1,151 +1,151 @@ > -video|1|982|0.010911|-2618|-0.029089|3600|0.040000|N/A|N/A|24815|564|K > -video|1|4582|0.050911|982|0.010911|3600|0.040000|N/A|N/A|16443|27072|_ > -video|1|8182|0.090911|4582|0.050911|3600|0.040000|N/A|N/A|14522|44932|_ > -video|1|11782|0.130911|8182|0.090911|3600|0.040000|N/A|N/A|12636|60536|_ > -video|1|15382|0.170911|11782|0.130911|3600|0.040000|N/A|N/A|13407|74260|_ > -video|1|18982|0.210911|15382|0.170911|3600|0.040000|N/A|N/A|13106|88924|_ > -video|1|22582|0.250911|18982|0.210911|3600|0.040000|N/A|N/ > A|12769|102836|_ > -video|1|26182|0.290911|22582|0.250911|3600|0.040000|N/A|N/ > A|12037|116748|_ > -audio|0|0|0.000000|0|0.000000|2351|0.026122|N/A|N/A|222|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|14112|130096|_ > -video|1|33382|0.370911|29782|0.330911|3600|0.040000|N/A|N/ > A|13343|145324|_ > -video|1|36982|0.410911|33382|0.370911|3600|0.040000|N/A|N/ > A|12149|162996|_ > -video|1|40582|0.450911|36982|0.410911|3600|0.040000|N/A|N/ > A|12296|176344|_ > -video|1|44182|0.490911|40582|0.450911|3600|0.040000|N/A|N/ > A|24800|189692|K > -video|1|47782|0.530911|44182|0.490911|3600|0.040000|N/A|N/ > A|17454|216388|_ > -video|1|51382|0.570911|47782|0.530911|3600|0.040000|N/A|N/ > A|15033|235000|_ > -video|1|54982|0.610911|51382|0.570911|3600|0.040000|N/A|N/ > A|13463|251356|_ > -video|1|58582|0.650911|54982|0.610911|3600|0.040000|N/A|N/ > A|12412|266020|_ > -video|1|62182|0.690911|58582|0.650911|3600|0.040000|N/A|N/ > A|13469|279744|_ > -audio|0|32915|0.365722|32915|0.365722|2351|0.026122|N/A|N/A|223|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|13850|294408|_ > -video|1|69382|0.770911|65782|0.730911|3600|0.040000|N/A|N/ > A|12177|309448|_ > -video|1|72982|0.810911|69382|0.770911|3600|0.040000|N/A|N/ > A|12706|325992|_ > -video|1|76582|0.850911|72982|0.810911|3600|0.040000|N/A|N/ > A|10838|339528|_ > -video|1|80182|0.890911|76582|0.850911|3600|0.040000|N/A|N/ > A|11300|351372|_ > -audio|0|65829|0.731433|65829|0.731433|2351|0.026122|N/A|N/A|223|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|12692|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|24815|564|K > -video|1|95564|1.061822|91964|1.021822|3600|0.040000|N/A|N/A|16443|27072|_ > -video|1|99164|1.101822|95564|1.061822|3600|0.040000|N/A|N/A|14522|44932|_ > -video|1|102764|1.141822|99164|1.101822|3600|0.040000| > N/A|N/A|12636|60536|_ > -video|1|106364|1.181822|102764|1.141822|3600|0.040000| > N/A|N/A|13407|74260|_ > -video|1|109964|1.221822|106364|1.181822|3600|0.040000| > N/A|N/A|13106|88924|_ > -video|1|113564|1.261822|109964|1.221822|3600|0.040000| > N/A|N/A|12769|102836|_ > -video|1|117164|1.301822|113564|1.261822|3600|0.040000| > N/A|N/A|12037|116748|_ > -audio|0|90982|1.010911|90982|1.010911|2351|0.026122|N/A|N/A|222|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|14112|130096|_ > -video|1|124364|1.381822|120764|1.341822|3600|0.040000| > N/A|N/A|13343|145324|_ > -video|1|127964|1.421822|124364|1.381822|3600|0.040000| > N/A|N/A|12149|162996|_ > -video|1|131564|1.461822|127964|1.421822|3600|0.040000| > N/A|N/A|12296|176344|_ > -video|1|135164|1.501822|131564|1.461822|3600|0.040000| > N/A|N/A|24800|189692|K > -video|1|138764|1.541822|135164|1.501822|3600|0.040000| > N/A|N/A|17454|216388|_ > -video|1|142364|1.581822|138764|1.541822|3600|0.040000| > N/A|N/A|15033|235000|_ > -video|1|145964|1.621822|142364|1.581822|3600|0.040000| > N/A|N/A|13463|251356|_ > -video|1|149564|1.661822|145964|1.621822|3600|0.040000| > N/A|N/A|12412|266020|_ > -video|1|153164|1.701822|149564|1.661822|3600|0.040000| > N/A|N/A|13469|279744|_ > -audio|0|123897|1.376633|123897|1.376633|2351|0.026122| > N/A|N/A|223|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|13850|294408|_ > -video|1|160364|1.781822|156764|1.741822|3600|0.040000| > N/A|N/A|12177|309448|_ > -video|1|163964|1.821822|160364|1.781822|3600|0.040000| > N/A|N/A|12706|325992|_ > -video|1|167564|1.861822|163964|1.821822|3600|0.040000| > N/A|N/A|10838|339528|_ > -video|1|171164|1.901822|167564|1.861822|3600|0.040000| > N/A|N/A|11300|351372|_ > -audio|0|156811|1.742344|156811|1.742344|2351|0.026122| > N/A|N/A|223|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|12692|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|12706|325992|_ > -video|1|143182|1.590911|139582|1.550911|3600|0.040000| > N/A|N/A|10838|339528|_ > -video|1|146782|1.630911|143182|1.590911|3600|0.040000| > N/A|N/A|11300|351372|_ > -audio|0|132429|1.471433|132429|1.471433|2351|0.026122| > N/A|N/A|223|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|12692|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|12149|162996|_ > -video|1|164782|1.830911|161182|1.790911|3600|0.040000| > N/A|N/A|12296|176344|_ > -video|1|168382|1.870911|164782|1.830911|3600|0.040000| > N/A|N/A|24800|189692|K > -video|1|171982|1.910911|168382|1.870911|3600|0.040000| > N/A|N/A|17454|216388|_ > -video|1|175582|1.950911|171982|1.910911|3600|0.040000| > N/A|N/A|15033|235000|_ > +video|1|982|0.010911|-2618|-0.029089|3600|0.040000|N/A|N/A|24815|564|K_ > +video|1|4582|0.050911|982|0.010911|3600|0.040000|N/A|N/A|16443|27072|__ > +video|1|8182|0.090911|4582|0.050911|3600|0.040000|N/A|N/A|14522|44932|__ > +video|1|11782|0.130911|8182|0.090911|3600|0.040000|N/A|N/A|12636|60536|__ > +video|1|15382|0.170911|11782|0.130911|3600|0.040000|N/A|N/ > A|13407|74260|__ > +video|1|18982|0.210911|15382|0.170911|3600|0.040000|N/A|N/ > A|13106|88924|__ > +video|1|22582|0.250911|18982|0.210911|3600|0.040000|N/A|N/ > A|12769|102836|__ > +video|1|26182|0.290911|22582|0.250911|3600|0.040000|N/A|N/ > A|12037|116748|__ > +audio|0|0|0.000000|0|0.000000|2351|0.026122|N/A|N/A|222|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|14112|130096|__ > +video|1|33382|0.370911|29782|0.330911|3600|0.040000|N/A|N/ > A|13343|145324|__ > +video|1|36982|0.410911|33382|0.370911|3600|0.040000|N/A|N/ > A|12149|162996|__ > +video|1|40582|0.450911|36982|0.410911|3600|0.040000|N/A|N/ > A|12296|176344|__ > +video|1|44182|0.490911|40582|0.450911|3600|0.040000|N/A|N/ > A|24800|189692|K_ > +video|1|47782|0.530911|44182|0.490911|3600|0.040000|N/A|N/ > A|17454|216388|__ > +video|1|51382|0.570911|47782|0.530911|3600|0.040000|N/A|N/ > A|15033|235000|__ > +video|1|54982|0.610911|51382|0.570911|3600|0.040000|N/A|N/ > A|13463|251356|__ > +video|1|58582|0.650911|54982|0.610911|3600|0.040000|N/A|N/ > A|12412|266020|__ > +video|1|62182|0.690911|58582|0.650911|3600|0.040000|N/A|N/ > A|13469|279744|__ > +audio|0|32915|0.365722|32915|0.365722|2351|0.026122|N/A|N/A|223|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|13850|294408|__ > +video|1|69382|0.770911|65782|0.730911|3600|0.040000|N/A|N/ > A|12177|309448|__ > +video|1|72982|0.810911|69382|0.770911|3600|0.040000|N/A|N/ > A|12706|325992|__ > +video|1|76582|0.850911|72982|0.810911|3600|0.040000|N/A|N/ > A|10838|339528|__ > +video|1|80182|0.890911|76582|0.850911|3600|0.040000|N/A|N/ > A|11300|351372|__ > +audio|0|65829|0.731433|65829|0.731433|2351|0.026122|N/A|N/A|223|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|12692|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|24815|564|K_ > +video|1|95564|1.061822|91964|1.021822|3600|0.040000|N/A|N/ > A|16443|27072|__ > +video|1|99164|1.101822|95564|1.061822|3600|0.040000|N/A|N/ > A|14522|44932|__ > +video|1|102764|1.141822|99164|1.101822|3600|0.040000| > N/A|N/A|12636|60536|__ > +video|1|106364|1.181822|102764|1.141822|3600|0.040000| > N/A|N/A|13407|74260|__ > +video|1|109964|1.221822|106364|1.181822|3600|0.040000| > N/A|N/A|13106|88924|__ > +video|1|113564|1.261822|109964|1.221822|3600|0.040000| > N/A|N/A|12769|102836|__ > +video|1|117164|1.301822|113564|1.261822|3600|0.040000| > N/A|N/A|12037|116748|__ > +audio|0|90982|1.010911|90982|1.010911|2351|0.026122|N/A|N/A|222|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|14112|130096|__ > +video|1|124364|1.381822|120764|1.341822|3600|0.040000| > N/A|N/A|13343|145324|__ > +video|1|127964|1.421822|124364|1.381822|3600|0.040000| > N/A|N/A|12149|162996|__ > +video|1|131564|1.461822|127964|1.421822|3600|0.040000| > N/A|N/A|12296|176344|__ > +video|1|135164|1.501822|131564|1.461822|3600|0.040000| > N/A|N/A|24800|189692|K_ > +video|1|138764|1.541822|135164|1.501822|3600|0.040000| > N/A|N/A|17454|216388|__ > +video|1|142364|1.581822|138764|1.541822|3600|0.040000| > N/A|N/A|15033|235000|__ > +video|1|145964|1.621822|142364|1.581822|3600|0.040000| > N/A|N/A|13463|251356|__ > +video|1|149564|1.661822|145964|1.621822|3600|0.040000| > N/A|N/A|12412|266020|__ > +video|1|153164|1.701822|149564|1.661822|3600|0.040000| > N/A|N/A|13469|279744|__ > +audio|0|123897|1.376633|123897|1.376633|2351|0.026122| > N/A|N/A|223|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|13850|294408|__ > +video|1|160364|1.781822|156764|1.741822|3600|0.040000| > N/A|N/A|12177|309448|__ > +video|1|163964|1.821822|160364|1.781822|3600|0.040000| > N/A|N/A|12706|325992|__ > +video|1|167564|1.861822|163964|1.821822|3600|0.040000| > N/A|N/A|10838|339528|__ > +video|1|171164|1.901822|167564|1.861822|3600|0.040000| > N/A|N/A|11300|351372|__ > +audio|0|156811|1.742344|156811|1.742344|2351|0.026122| > N/A|N/A|223|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|12692|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|12706|325992|__ > +video|1|143182|1.590911|139582|1.550911|3600|0.040000| > N/A|N/A|10838|339528|__ > +video|1|146782|1.630911|143182|1.590911|3600|0.040000| > N/A|N/A|11300|351372|__ > +audio|0|132429|1.471433|132429|1.471433|2351|0.026122| > N/A|N/A|223|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|12692|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|12149|162996|__ > +video|1|164782|1.830911|161182|1.790911|3600|0.040000| > N/A|N/A|12296|176344|__ > +video|1|168382|1.870911|164782|1.830911|3600|0.040000| > N/A|N/A|24800|189692|K_ > +video|1|171982|1.910911|168382|1.870911|3600|0.040000| > N/A|N/A|17454|216388|__ > +video|1|175582|1.950911|171982|1.910911|3600|0.040000| > N/A|N/A|15033|235000|__ > 0|mp2|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|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1| > 1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|N/A|1|N/ > A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60| > 0|0|0|0|0|0|0|0|0|0|0 > diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_ > compact > index d529bb6..9a5f531 100644 > --- a/tests/ref/fate/ffprobe_compact > +++ b/tests/ref/fate/ffprobe_compact > @@ -1,30 +1,30 @@ > -packet|codec_type=audio|stream_index=0|pts=0|pts_time= > 0.000000|dts=0|dts_time=0.000000|duration=1024|duration_ > time=0.023220|convergence_duration=N/A|convergence_ > duration_time=N/A|size=2048|pos=647|flags=K > +packet|codec_type=audio|stream_index=0|pts=0|pts_time= > 0.000000|dts=0|dts_time=0.000000|duration=1024|duration_ > time=0.023220|convergence_duration=N/A|convergence_ > duration_time=N/A|size=2048|pos=647|flags=K_ > frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=0| > pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_ > effort_timestamp=0|best_effort_timestamp_time=0. > 000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_ > pos=647|pkt_size=2048|sample_fmt=s16|nb_samples=1024| > channels=1|channel_layout=unknown > -packet|codec_type=video|stream_index=1|pts=0|pts_time= > 0.000000|dts=0|dts_time=0.000000|duration=2048|duration_ > time=0.040000|convergence_duration=N/A|convergence_ > duration_time=N/A|size=230400|pos=2722|flags=K > +packet|codec_type=video|stream_index=1|pts=0|pts_time= > 0.000000|dts=0|dts_time=0.000000|duration=2048|duration_ > time=0.040000|convergence_duration=N/A|convergence_ > duration_time=N/A|size=230400|pos=2722|flags=K_ > frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=0| > pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_ > effort_timestamp=0|best_effort_timestamp_time=0. > 000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_ > pos=2722|pkt_size=230400|width=320|height=240|pix_fmt= > rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_ > number=0|display_picture_number=0|interlaced_frame=0| > top_field_first=0|repeat_pict=0 > -packet|codec_type=video|stream_index=2|pts=0|pts_time= > 0.000000|dts=0|dts_time=0.000000|duration=2048|duration_ > time=0.040000|convergence_duration=N/A|convergence_ > duration_time=N/A|size=30000|pos=233143|flags=K > +packet|codec_type=video|stream_index=2|pts=0|pts_time= > 0.000000|dts=0|dts_time=0.000000|duration=2048|duration_ > time=0.040000|convergence_duration=N/A|convergence_ > duration_time=N/A|size=30000|pos=233143|flags=K_ > frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=0| > pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_ > effort_timestamp=0|best_effort_timestamp_time=0. > 000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_ > pos=233143|pkt_size=30000|width=100|height=100|pix_fmt= > rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_ > number=0|display_picture_number=0|interlaced_frame=0| > top_field_first=0|repeat_pict=0 > -packet|codec_type=audio|stream_index=0|pts=1024|pts_ > time=0.023220|dts=1024|dts_time=0.023220|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=263148|flags=K > +packet|codec_type=audio|stream_index=0|pts=1024|pts_ > time=0.023220|dts=1024|dts_time=0.023220|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=263148|flags=K_ > frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts= > 1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0. > 023220|best_effort_timestamp=1024|best_effort_timestamp_ > time=0.023220|pkt_duration=1024|pkt_duration_time=0. > 023220|pkt_pos=263148|pkt_size=2048|sample_fmt=s16|nb_ > samples=1024|channels=1|channel_layout=unknown > -packet|codec_type=video|stream_index=1|pts=2048|pts_ > time=0.040000|dts=2048|dts_time=0.040000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=230400|pos=265226|flags=K > +packet|codec_type=video|stream_index=1|pts=2048|pts_ > time=0.040000|dts=2048|dts_time=0.040000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=230400|pos=265226|flags=K_ > frame|media_type=video|stream_index=1|key_frame=1|pkt_pts= > 2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0. > 040000|best_effort_timestamp=2048|best_effort_timestamp_ > time=0.040000|pkt_duration=2048|pkt_duration_time=0. > 040000|pkt_pos=265226|pkt_size=230400|width=320|height= > 240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I| > coded_picture_number=0|display_picture_number=0| > interlaced_frame=0|top_field_first=0|repeat_pict=0 > -packet|codec_type=video|stream_index=2|pts=2048|pts_ > time=0.040000|dts=2048|dts_time=0.040000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=30000|pos=495650|flags=K > +packet|codec_type=video|stream_index=2|pts=2048|pts_ > time=0.040000|dts=2048|dts_time=0.040000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=30000|pos=495650|flags=K_ > frame|media_type=video|stream_index=2|key_frame=1|pkt_pts= > 2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0. > 040000|best_effort_timestamp=2048|best_effort_timestamp_ > time=0.040000|pkt_duration=2048|pkt_duration_time=0. > 040000|pkt_pos=495650|pkt_size=30000|width=100|height= > 100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I| > coded_picture_number=0|display_picture_number=0| > interlaced_frame=0|top_field_first=0|repeat_pict=0 > -packet|codec_type=audio|stream_index=0|pts=2048|pts_ > time=0.046440|dts=2048|dts_time=0.046440|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=525655|flags=K > +packet|codec_type=audio|stream_index=0|pts=2048|pts_ > time=0.046440|dts=2048|dts_time=0.046440|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=525655|flags=K_ > frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts= > 2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0. > 046440|best_effort_timestamp=2048|best_effort_timestamp_ > time=0.046440|pkt_duration=1024|pkt_duration_time=0. > 023220|pkt_pos=525655|pkt_size=2048|sample_fmt=s16|nb_ > samples=1024|channels=1|channel_layout=unknown > -packet|codec_type=audio|stream_index=0|pts=3072|pts_ > time=0.069660|dts=3072|dts_time=0.069660|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=527726|flags=K > +packet|codec_type=audio|stream_index=0|pts=3072|pts_ > time=0.069660|dts=3072|dts_time=0.069660|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=527726|flags=K_ > frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts= > 3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0. > 069660|best_effort_timestamp=3072|best_effort_timestamp_ > time=0.069660|pkt_duration=1024|pkt_duration_time=0. > 023220|pkt_pos=527726|pkt_size=2048|sample_fmt=s16|nb_ > samples=1024|channels=1|channel_layout=unknown > -packet|codec_type=video|stream_index=1|pts=4096|pts_ > time=0.080000|dts=4096|dts_time=0.080000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=230400|pos=529804|flags=K > +packet|codec_type=video|stream_index=1|pts=4096|pts_ > time=0.080000|dts=4096|dts_time=0.080000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=230400|pos=529804|flags=K_ > frame|media_type=video|stream_index=1|key_frame=1|pkt_pts= > 4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0. > 080000|best_effort_timestamp=4096|best_effort_timestamp_ > time=0.080000|pkt_duration=2048|pkt_duration_time=0. > 040000|pkt_pos=529804|pkt_size=230400|width=320|height= > 240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I| > coded_picture_number=0|display_picture_number=0| > interlaced_frame=0|top_field_first=0|repeat_pict=0 > -packet|codec_type=video|stream_index=2|pts=4096|pts_ > time=0.080000|dts=4096|dts_time=0.080000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=30000|pos=760228|flags=K > +packet|codec_type=video|stream_index=2|pts=4096|pts_ > time=0.080000|dts=4096|dts_time=0.080000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=30000|pos=760228|flags=K_ > frame|media_type=video|stream_index=2|key_frame=1|pkt_pts= > 4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0. > 080000|best_effort_timestamp=4096|best_effort_timestamp_ > time=0.080000|pkt_duration=2048|pkt_duration_time=0. > 040000|pkt_pos=760228|pkt_size=30000|width=100|height= > 100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I| > coded_picture_number=0|display_picture_number=0| > interlaced_frame=0|top_field_first=0|repeat_pict=0 > -packet|codec_type=audio|stream_index=0|pts=4096|pts_ > time=0.092880|dts=4096|dts_time=0.092880|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=790233|flags=K > +packet|codec_type=audio|stream_index=0|pts=4096|pts_ > time=0.092880|dts=4096|dts_time=0.092880|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=790233|flags=K_ > frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts= > 4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0. > 092880|best_effort_timestamp=4096|best_effort_timestamp_ > time=0.092880|pkt_duration=1024|pkt_duration_time=0. > 023220|pkt_pos=790233|pkt_size=2048|sample_fmt=s16|nb_ > samples=1024|channels=1|channel_layout=unknown > -packet|codec_type=audio|stream_index=0|pts=5120|pts_ > time=0.116100|dts=5120|dts_time=0.116100|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=792304|flags=K > +packet|codec_type=audio|stream_index=0|pts=5120|pts_ > time=0.116100|dts=5120|dts_time=0.116100|duration=1024| > duration_time=0.023220|convergence_duration=N/A| > convergence_duration_time=N/A|size=2048|pos=792304|flags=K_ > frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts= > 5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0. > 116100|best_effort_timestamp=5120|best_effort_timestamp_ > time=0.116100|pkt_duration=1024|pkt_duration_time=0. > 023220|pkt_pos=792304|pkt_size=2048|sample_fmt=s16|nb_ > samples=1024|channels=1|channel_layout=unknown > -packet|codec_type=video|stream_index=1|pts=6144|pts_ > time=0.120000|dts=6144|dts_time=0.120000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=230400|pos=794382|flags=K > +packet|codec_type=video|stream_index=1|pts=6144|pts_ > time=0.120000|dts=6144|dts_time=0.120000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=230400|pos=794382|flags=K_ > frame|media_type=video|stream_index=1|key_frame=1|pkt_pts= > 6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0. > 120000|best_effort_timestamp=6144|best_effort_timestamp_ > time=0.120000|pkt_duration=2048|pkt_duration_time=0. > 040000|pkt_pos=794382|pkt_size=230400|width=320|height= > 240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I| > coded_picture_number=0|display_picture_number=0| > interlaced_frame=0|top_field_first=0|repeat_pict=0 > -packet|codec_type=video|stream_index=2|pts=6144|pts_ > time=0.120000|dts=6144|dts_time=0.120000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=30000|pos=1024806|flags=K > +packet|codec_type=video|stream_index=2|pts=6144|pts_ > time=0.120000|dts=6144|dts_time=0.120000|duration=2048| > duration_time=0.040000|convergence_duration=N/A| > convergence_duration_time=N/A|size=30000|pos=1024806|flags=K_ > frame|media_type=video|stream_index=2|key_frame=1|pkt_pts= > 6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0. > 120000|best_effort_timestamp=6144|best_effort_timestamp_ > time=0.120000|pkt_duration=2048|pkt_duration_time=0. > 040000|pkt_pos=1024806|pkt_size=30000|width=100|height= > 100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I| > coded_picture_number=0|display_picture_number=0| > interlaced_frame=0|top_field_first=0|repeat_pict=0 > stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_ > type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16] > |codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100| > channels=1|channel_layout=unknown|bits_per_sample=16|id= > N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/ > 44100|start_pts=0|start_time=0.000000|duration_ts=N/A| > duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_ > sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets= > 6|disposition:default=0|disposition:dub=0|disposition: > original=0|disposition:comment=0|disposition:lyrics= > 0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired= > 0|disposition:visual_impaired=0|disposition:clean_effects=0| > disposition:attached_pic=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le > stream|index=1|codec_name=rawvideo|profile=unknown| > codec_type=video|codec_time_base=1/25|codec_tag_string= > RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_ > width=320|coded_height=240|has_b_frames=0|sample_aspect_ > ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level= > -99|color_range=N/A|color_space=unknown|color_transfer= > unknown|color_primaries=unknown|chroma_location= > unspecified|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1| > avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_ > time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_ > bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_ > read_frames=4|nb_read_packets=4|disposition:default=0| > disposition:dub=0|disposition:original=0|disposition: > comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0| > disposition:hearing_impaired=0|disposition:visual_impaired= > 0|disposition:clean_effects=0|disposition:attached_pic=0| > tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc > rawvideo > diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv > index 882c1b8..c5bef51 100644 > --- a/tests/ref/fate/ffprobe_csv > +++ b/tests/ref/fate/ffprobe_csv > @@ -1,30 +1,30 @@ > -packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K > +packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K_ > frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0. > 023220,647,2048,s16,1024,1,unknown > -packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K > +packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K_ > frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0. > 040000,2722,230400,320,240,rgb24,1:1,I,0,0,0,0,0 > -packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233143,K > +packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/ > A,30000,233143,K_ > frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0. > 040000,233143,30000,100,100,rgb24,1:1,I,0,0,0,0,0 > -packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/ > A,N/A,2048,263148,K > +packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/ > A,N/A,2048,263148,K_ > frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220, > 1024,0.023220,263148,2048,s16,1024,1,unknown > -packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/ > A,N/A,230400,265226,K > +packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/ > A,N/A,230400,265226,K_ > frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000, > 2048,0.040000,265226,230400,320,240,rgb24,1:1,I,0,0,0,0,0 > -packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/ > A,N/A,30000,495650,K > +packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/ > A,N/A,30000,495650,K_ > frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000, > 2048,0.040000,495650,30000,100,100,rgb24,1:1,I,0,0,0,0,0 > -packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/ > A,N/A,2048,525655,K > +packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/ > A,N/A,2048,525655,K_ > frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440, > 1024,0.023220,525655,2048,s16,1024,1,unknown > -packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/ > A,N/A,2048,527726,K > +packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/ > A,N/A,2048,527726,K_ > frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660, > 1024,0.023220,527726,2048,s16,1024,1,unknown > -packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/ > A,N/A,230400,529804,K > +packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/ > A,N/A,230400,529804,K_ > frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000, > 2048,0.040000,529804,230400,320,240,rgb24,1:1,I,0,0,0,0,0 > -packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/ > A,N/A,30000,760228,K > +packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/ > A,N/A,30000,760228,K_ > frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000, > 2048,0.040000,760228,30000,100,100,rgb24,1:1,I,0,0,0,0,0 > -packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/ > A,N/A,2048,790233,K > +packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/ > A,N/A,2048,790233,K_ > frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880, > 1024,0.023220,790233,2048,s16,1024,1,unknown > -packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/ > A,N/A,2048,792304,K > +packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/ > A,N/A,2048,792304,K_ > frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100, > 1024,0.023220,792304,2048,s16,1024,1,unknown > -packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/ > A,N/A,230400,794382,K > +packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/ > A,N/A,230400,794382,K_ > frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000, > 2048,0.040000,794382,230400,320,240,rgb24,1:1,I,0,0,0,0,0 > -packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/ > A,N/A,30000,1024806,K > +packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/ > A,N/A,30000,1024806,K_ > frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000, > 2048,0.040000,1024806,30000,100,100,rgb24,1:1,I,0,0,0,0,0 > stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1, > unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A, > 705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le > stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752, > 320,240,320,240,0,1:1,4:3,rgb24,-99,N/A,unknown,unknown, > unknown,unspecified,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000, > N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar, > field-and-tags-conflict-attempt,Lavc rawvideo > diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_ > default > index 4adb330..35418d4 100644 > --- a/tests/ref/fate/ffprobe_default > +++ b/tests/ref/fate/ffprobe_default > @@ -11,7 +11,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=647 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=audio > @@ -45,7 +45,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=2722 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -85,7 +85,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=233143 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -125,7 +125,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=263148 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=audio > @@ -159,7 +159,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=265226 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -199,7 +199,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=495650 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -239,7 +239,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=525655 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=audio > @@ -273,7 +273,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=527726 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=audio > @@ -307,7 +307,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=529804 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -347,7 +347,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=760228 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -387,7 +387,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=790233 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=audio > @@ -421,7 +421,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=792304 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=audio > @@ -455,7 +455,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=794382 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > @@ -495,7 +495,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=1024806 > -flags=K > +flags=K_ > [/PACKET] > [FRAME] > media_type=video > diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat > index 4b2c91a..f9755c2 100644 > --- a/tests/ref/fate/ffprobe_flat > +++ b/tests/ref/fate/ffprobe_flat > @@ -10,7 +10,7 @@ packets_and_frames.packet.0.convergence_duration="N/A" > packets_and_frames.packet.0.convergence_duration_time="N/A" > packets_and_frames.packet.0.size="2048" > packets_and_frames.packet.0.pos="647" > -packets_and_frames.packet.0.flags="K" > +packets_and_frames.packet.0.flags="K_" > packets_and_frames.frame.0.media_type="audio" > packets_and_frames.frame.0.stream_index=0 > packets_and_frames.frame.0.key_frame=1 > @@ -40,7 +40,7 @@ packets_and_frames.packet.1.convergence_duration="N/A" > packets_and_frames.packet.1.convergence_duration_time="N/A" > packets_and_frames.packet.1.size="230400" > packets_and_frames.packet.1.pos="2722" > -packets_and_frames.packet.1.flags="K" > +packets_and_frames.packet.1.flags="K_" > packets_and_frames.frame.1.media_type="video" > packets_and_frames.frame.1.stream_index=1 > packets_and_frames.frame.1.key_frame=1 > @@ -76,7 +76,7 @@ packets_and_frames.packet.2.convergence_duration="N/A" > packets_and_frames.packet.2.convergence_duration_time="N/A" > packets_and_frames.packet.2.size="30000" > packets_and_frames.packet.2.pos="233143" > -packets_and_frames.packet.2.flags="K" > +packets_and_frames.packet.2.flags="K_" > packets_and_frames.frame.2.media_type="video" > packets_and_frames.frame.2.stream_index=2 > packets_and_frames.frame.2.key_frame=1 > @@ -112,7 +112,7 @@ packets_and_frames.packet.3.convergence_duration="N/A" > packets_and_frames.packet.3.convergence_duration_time="N/A" > packets_and_frames.packet.3.size="2048" > packets_and_frames.packet.3.pos="263148" > -packets_and_frames.packet.3.flags="K" > +packets_and_frames.packet.3.flags="K_" > packets_and_frames.frame.3.media_type="audio" > packets_and_frames.frame.3.stream_index=0 > packets_and_frames.frame.3.key_frame=1 > @@ -142,7 +142,7 @@ packets_and_frames.packet.4.convergence_duration="N/A" > packets_and_frames.packet.4.convergence_duration_time="N/A" > packets_and_frames.packet.4.size="230400" > packets_and_frames.packet.4.pos="265226" > -packets_and_frames.packet.4.flags="K" > +packets_and_frames.packet.4.flags="K_" > packets_and_frames.frame.4.media_type="video" > packets_and_frames.frame.4.stream_index=1 > packets_and_frames.frame.4.key_frame=1 > @@ -178,7 +178,7 @@ packets_and_frames.packet.5.convergence_duration="N/A" > packets_and_frames.packet.5.convergence_duration_time="N/A" > packets_and_frames.packet.5.size="30000" > packets_and_frames.packet.5.pos="495650" > -packets_and_frames.packet.5.flags="K" > +packets_and_frames.packet.5.flags="K_" > packets_and_frames.frame.5.media_type="video" > packets_and_frames.frame.5.stream_index=2 > packets_and_frames.frame.5.key_frame=1 > @@ -214,7 +214,7 @@ packets_and_frames.packet.6.convergence_duration="N/A" > packets_and_frames.packet.6.convergence_duration_time="N/A" > packets_and_frames.packet.6.size="2048" > packets_and_frames.packet.6.pos="525655" > -packets_and_frames.packet.6.flags="K" > +packets_and_frames.packet.6.flags="K_" > packets_and_frames.frame.6.media_type="audio" > packets_and_frames.frame.6.stream_index=0 > packets_and_frames.frame.6.key_frame=1 > @@ -244,7 +244,7 @@ packets_and_frames.packet.7.convergence_duration="N/A" > packets_and_frames.packet.7.convergence_duration_time="N/A" > packets_and_frames.packet.7.size="2048" > packets_and_frames.packet.7.pos="527726" > -packets_and_frames.packet.7.flags="K" > +packets_and_frames.packet.7.flags="K_" > packets_and_frames.frame.7.media_type="audio" > packets_and_frames.frame.7.stream_index=0 > packets_and_frames.frame.7.key_frame=1 > @@ -274,7 +274,7 @@ packets_and_frames.packet.8.convergence_duration="N/A" > packets_and_frames.packet.8.convergence_duration_time="N/A" > packets_and_frames.packet.8.size="230400" > packets_and_frames.packet.8.pos="529804" > -packets_and_frames.packet.8.flags="K" > +packets_and_frames.packet.8.flags="K_" > packets_and_frames.frame.8.media_type="video" > packets_and_frames.frame.8.stream_index=1 > packets_and_frames.frame.8.key_frame=1 > @@ -310,7 +310,7 @@ packets_and_frames.packet.9.convergence_duration="N/A" > packets_and_frames.packet.9.convergence_duration_time="N/A" > packets_and_frames.packet.9.size="30000" > packets_and_frames.packet.9.pos="760228" > -packets_and_frames.packet.9.flags="K" > +packets_and_frames.packet.9.flags="K_" > packets_and_frames.frame.9.media_type="video" > packets_and_frames.frame.9.stream_index=2 > packets_and_frames.frame.9.key_frame=1 > @@ -346,7 +346,7 @@ packets_and_frames.packet.10. > convergence_duration="N/A" > packets_and_frames.packet.10.convergence_duration_time="N/A" > packets_and_frames.packet.10.size="2048" > packets_and_frames.packet.10.pos="790233" > -packets_and_frames.packet.10.flags="K" > +packets_and_frames.packet.10.flags="K_" > packets_and_frames.frame.10.media_type="audio" > packets_and_frames.frame.10.stream_index=0 > packets_and_frames.frame.10.key_frame=1 > @@ -376,7 +376,7 @@ packets_and_frames.packet.11. > convergence_duration="N/A" > packets_and_frames.packet.11.convergence_duration_time="N/A" > packets_and_frames.packet.11.size="2048" > packets_and_frames.packet.11.pos="792304" > -packets_and_frames.packet.11.flags="K" > +packets_and_frames.packet.11.flags="K_" > packets_and_frames.frame.11.media_type="audio" > packets_and_frames.frame.11.stream_index=0 > packets_and_frames.frame.11.key_frame=1 > @@ -406,7 +406,7 @@ packets_and_frames.packet.12. > convergence_duration="N/A" > packets_and_frames.packet.12.convergence_duration_time="N/A" > packets_and_frames.packet.12.size="230400" > packets_and_frames.packet.12.pos="794382" > -packets_and_frames.packet.12.flags="K" > +packets_and_frames.packet.12.flags="K_" > packets_and_frames.frame.12.media_type="video" > packets_and_frames.frame.12.stream_index=1 > packets_and_frames.frame.12.key_frame=1 > @@ -442,7 +442,7 @@ packets_and_frames.packet.13. > convergence_duration="N/A" > packets_and_frames.packet.13.convergence_duration_time="N/A" > packets_and_frames.packet.13.size="30000" > packets_and_frames.packet.13.pos="1024806" > -packets_and_frames.packet.13.flags="K" > +packets_and_frames.packet.13.flags="K_" > packets_and_frames.frame.13.media_type="video" > packets_and_frames.frame.13.stream_index=2 > packets_and_frames.frame.13.key_frame=1 > diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini > index ba59d61..472ec72 100644 > --- a/tests/ref/fate/ffprobe_ini > +++ b/tests/ref/fate/ffprobe_ini > @@ -13,7 +13,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=647 > -flags=K > +flags=K_ > > [packets_and_frames.frame.0] > media_type=audio > @@ -47,7 +47,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=2722 > -flags=K > +flags=K_ > > [packets_and_frames.frame.1] > media_type=video > @@ -87,7 +87,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=233143 > -flags=K > +flags=K_ > > [packets_and_frames.frame.2] > media_type=video > @@ -127,7 +127,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=263148 > -flags=K > +flags=K_ > > [packets_and_frames.frame.3] > media_type=audio > @@ -161,7 +161,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=265226 > -flags=K > +flags=K_ > > [packets_and_frames.frame.4] > media_type=video > @@ -201,7 +201,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=495650 > -flags=K > +flags=K_ > > [packets_and_frames.frame.5] > media_type=video > @@ -241,7 +241,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=525655 > -flags=K > +flags=K_ > > [packets_and_frames.frame.6] > media_type=audio > @@ -275,7 +275,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=527726 > -flags=K > +flags=K_ > > [packets_and_frames.frame.7] > media_type=audio > @@ -309,7 +309,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=529804 > -flags=K > +flags=K_ > > [packets_and_frames.frame.8] > media_type=video > @@ -349,7 +349,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=760228 > -flags=K > +flags=K_ > > [packets_and_frames.frame.9] > media_type=video > @@ -389,7 +389,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=790233 > -flags=K > +flags=K_ > > [packets_and_frames.frame.10] > media_type=audio > @@ -423,7 +423,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=2048 > pos=792304 > -flags=K > +flags=K_ > > [packets_and_frames.frame.11] > media_type=audio > @@ -457,7 +457,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=230400 > pos=794382 > -flags=K > +flags=K_ > > [packets_and_frames.frame.12] > media_type=video > @@ -497,7 +497,7 @@ convergence_duration=N/A > convergence_duration_time=N/A > size=30000 > pos=1024806 > -flags=K > +flags=K_ > > [packets_and_frames.frame.13] > media_type=video > diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json > index 8d7abda..e9ef1f0 100644 > --- a/tests/ref/fate/ffprobe_json > +++ b/tests/ref/fate/ffprobe_json > @@ -12,7 +12,7 @@ > "duration_time": "0.023220", > "size": "2048", > "pos": "647", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -45,7 +45,7 @@ > "duration_time": "0.040000", > "size": "230400", > "pos": "2722", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -85,7 +85,7 @@ > "duration_time": "0.040000", > "size": "30000", > "pos": "233143", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -125,7 +125,7 @@ > "duration_time": "0.023220", > "size": "2048", > "pos": "263148", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -158,7 +158,7 @@ > "duration_time": "0.040000", > "size": "230400", > "pos": "265226", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -198,7 +198,7 @@ > "duration_time": "0.040000", > "size": "30000", > "pos": "495650", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -238,7 +238,7 @@ > "duration_time": "0.023220", > "size": "2048", > "pos": "525655", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -271,7 +271,7 @@ > "duration_time": "0.023220", > "size": "2048", > "pos": "527726", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -304,7 +304,7 @@ > "duration_time": "0.040000", > "size": "230400", > "pos": "529804", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -344,7 +344,7 @@ > "duration_time": "0.040000", > "size": "30000", > "pos": "760228", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -384,7 +384,7 @@ > "duration_time": "0.023220", > "size": "2048", > "pos": "790233", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -417,7 +417,7 @@ > "duration_time": "0.023220", > "size": "2048", > "pos": "792304", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -450,7 +450,7 @@ > "duration_time": "0.040000", > "size": "230400", > "pos": "794382", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > @@ -490,7 +490,7 @@ > "duration_time": "0.040000", > "size": "30000", > "pos": "1024806", > - "flags": "K" > + "flags": "K_" > }, > { > "type": "frame", > diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml > index b51b0c6..4639a23 100644 > --- a/tests/ref/fate/ffprobe_xml > +++ b/tests/ref/fate/ffprobe_xml > @@ -1,33 +1,33 @@ > <?xml version="1.0" encoding="UTF-8"?> > <ffprobe> > <packets_and_frames> > - <packet codec_type="audio" stream_index="0" pts="0" > pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" > duration_time="0.023220" size="2048" pos="647" flags="K"/> > + <packet codec_type="audio" stream_index="0" pts="0" > pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" > duration_time="0.023220" size="2048" pos="647" flags="K_"/> > <frame media_type="audio" stream_index="0" key_frame="1" > pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" > best_effort_timestamp="0" best_effort_timestamp_time="0.000000" > pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="647" > pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> > - <packet codec_type="video" stream_index="1" pts="0" > pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" > duration_time="0.040000" size="230400" pos="2722" flags="K"/> > + <packet codec_type="video" stream_index="1" pts="0" > pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" > duration_time="0.040000" size="230400" pos="2722" flags="K_"/> > <frame media_type="video" stream_index="1" key_frame="1" > pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" > best_effort_timestamp="0" best_effort_timestamp_time="0.000000" > pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2722" > pkt_size="230400" width="320" height="240" pix_fmt="rgb24" > sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" > display_picture_number="0" interlaced_frame="0" top_field_first="0" > repeat_pict="0"/> > - <packet codec_type="video" stream_index="2" pts="0" > pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" > duration_time="0.040000" size="30000" pos="233143" flags="K"/> > + <packet codec_type="video" stream_index="2" pts="0" > pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" > duration_time="0.040000" size="30000" pos="233143" flags="K_"/> > <frame media_type="video" stream_index="2" key_frame="1" > pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" > best_effort_timestamp="0" best_effort_timestamp_time="0.000000" > pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233143" > pkt_size="30000" width="100" height="100" pix_fmt="rgb24" > sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" > display_picture_number="0" interlaced_frame="0" top_field_first="0" > repeat_pict="0"/> > - <packet codec_type="audio" stream_index="0" pts="1024" > pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" > duration_time="0.023220" size="2048" pos="263148" flags="K"/> > + <packet codec_type="audio" stream_index="0" pts="1024" > pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" > duration_time="0.023220" size="2048" pos="263148" flags="K_"/> > <frame media_type="audio" stream_index="0" key_frame="1" > pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" > pkt_dts_time="0.023220" best_effort_timestamp="1024" > best_effort_timestamp_time="0.023220" pkt_duration="1024" > pkt_duration_time="0.023220" pkt_pos="263148" pkt_size="2048" > sample_fmt="s16" nb_samples="1024" channels="1"/> > - <packet codec_type="video" stream_index="1" pts="2048" > pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" > duration_time="0.040000" size="230400" pos="265226" flags="K"/> > + <packet codec_type="video" stream_index="1" pts="2048" > pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" > duration_time="0.040000" size="230400" pos="265226" flags="K_"/> > <frame media_type="video" stream_index="1" key_frame="1" > pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" > pkt_dts_time="0.040000" best_effort_timestamp="2048" > best_effort_timestamp_time="0.040000" pkt_duration="2048" > pkt_duration_time="0.040000" pkt_pos="265226" pkt_size="230400" width="320" > height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" > coded_picture_number="0" display_picture_number="0" interlaced_frame="0" > top_field_first="0" repeat_pict="0"/> > - <packet codec_type="video" stream_index="2" pts="2048" > pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" > duration_time="0.040000" size="30000" pos="495650" flags="K"/> > + <packet codec_type="video" stream_index="2" pts="2048" > pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" > duration_time="0.040000" size="30000" pos="495650" flags="K_"/> > <frame media_type="video" stream_index="2" key_frame="1" > pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" > pkt_dts_time="0.040000" best_effort_timestamp="2048" > best_effort_timestamp_time="0.040000" pkt_duration="2048" > pkt_duration_time="0.040000" pkt_pos="495650" pkt_size="30000" width="100" > height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" > coded_picture_number="0" display_picture_number="0" interlaced_frame="0" > top_field_first="0" repeat_pict="0"/> > - <packet codec_type="audio" stream_index="0" pts="2048" > pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" > duration_time="0.023220" size="2048" pos="525655" flags="K"/> > + <packet codec_type="audio" stream_index="0" pts="2048" > pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" > duration_time="0.023220" size="2048" pos="525655" flags="K_"/> > <frame media_type="audio" stream_index="0" key_frame="1" > pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" > pkt_dts_time="0.046440" best_effort_timestamp="2048" > best_effort_timestamp_time="0.046440" pkt_duration="1024" > pkt_duration_time="0.023220" pkt_pos="525655" pkt_size="2048" > sample_fmt="s16" nb_samples="1024" channels="1"/> > - <packet codec_type="audio" stream_index="0" pts="3072" > pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" > duration_time="0.023220" size="2048" pos="527726" flags="K"/> > + <packet codec_type="audio" stream_index="0" pts="3072" > pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" > duration_time="0.023220" size="2048" pos="527726" flags="K_"/> > <frame media_type="audio" stream_index="0" key_frame="1" > pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" > pkt_dts_time="0.069660" best_effort_timestamp="3072" > best_effort_timestamp_time="0.069660" pkt_duration="1024" > pkt_duration_time="0.023220" pkt_pos="527726" pkt_size="2048" > sample_fmt="s16" nb_samples="1024" channels="1"/> > - <packet codec_type="video" stream_index="1" pts="4096" > pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" > duration_time="0.040000" size="230400" pos="529804" flags="K"/> > + <packet codec_type="video" stream_index="1" pts="4096" > pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" > duration_time="0.040000" size="230400" pos="529804" flags="K_"/> > <frame media_type="video" stream_index="1" key_frame="1" > pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" > pkt_dts_time="0.080000" best_effort_timestamp="4096" > best_effort_timestamp_time="0.080000" pkt_duration="2048" > pkt_duration_time="0.040000" pkt_pos="529804" pkt_size="230400" width="320" > height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" > coded_picture_number="0" display_picture_number="0" interlaced_frame="0" > top_field_first="0" repeat_pict="0"/> > - <packet codec_type="video" stream_index="2" pts="4096" > pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" > duration_time="0.040000" size="30000" pos="760228" flags="K"/> > + <packet codec_type="video" stream_index="2" pts="4096" > pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" > duration_time="0.040000" size="30000" pos="760228" flags="K_"/> > <frame media_type="video" stream_index="2" key_frame="1" > pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" > pkt_dts_time="0.080000" best_effort_timestamp="4096" > best_effort_timestamp_time="0.080000" pkt_duration="2048" > pkt_duration_time="0.040000" pkt_pos="760228" pkt_size="30000" width="100" > height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" > coded_picture_number="0" display_picture_number="0" interlaced_frame="0" > top_field_first="0" repeat_pict="0"/> > - <packet codec_type="audio" stream_index="0" pts="4096" > pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" > duration_time="0.023220" size="2048" pos="790233" flags="K"/> > + <packet codec_type="audio" stream_index="0" pts="4096" > pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" > duration_time="0.023220" size="2048" pos="790233" flags="K_"/> > <frame media_type="audio" stream_index="0" key_frame="1" > pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" > pkt_dts_time="0.092880" best_effort_timestamp="4096" > best_effort_timestamp_time="0.092880" pkt_duration="1024" > pkt_duration_time="0.023220" pkt_pos="790233" pkt_size="2048" > sample_fmt="s16" nb_samples="1024" channels="1"/> > - <packet codec_type="audio" stream_index="0" pts="5120" > pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" > duration_time="0.023220" size="2048" pos="792304" flags="K"/> > + <packet codec_type="audio" stream_index="0" pts="5120" > pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" > duration_time="0.023220" size="2048" pos="792304" flags="K_"/> > <frame media_type="audio" stream_index="0" key_frame="1" > pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" > pkt_dts_time="0.116100" best_effort_timestamp="5120" > best_effort_timestamp_time="0.116100" pkt_duration="1024" > pkt_duration_time="0.023220" pkt_pos="792304" pkt_size="2048" > sample_fmt="s16" nb_samples="1024" channels="1"/> > - <packet codec_type="video" stream_index="1" pts="6144" > pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" > duration_time="0.040000" size="230400" pos="794382" flags="K"/> > + <packet codec_type="video" stream_index="1" pts="6144" > pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" > duration_time="0.040000" size="230400" pos="794382" flags="K_"/> > <frame media_type="video" stream_index="1" key_frame="1" > pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" > pkt_dts_time="0.120000" best_effort_timestamp="6144" > best_effort_timestamp_time="0.120000" pkt_duration="2048" > pkt_duration_time="0.040000" pkt_pos="794382" pkt_size="230400" width="320" > height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" > coded_picture_number="0" display_picture_number="0" interlaced_frame="0" > top_field_first="0" repeat_pict="0"/> > - <packet codec_type="video" stream_index="2" pts="6144" > pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" > duration_time="0.040000" size="30000" pos="1024806" flags="K"/> > + <packet codec_type="video" stream_index="2" pts="6144" > pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" > duration_time="0.040000" size="30000" pos="1024806" flags="K_"/> > <frame media_type="video" stream_index="2" key_frame="1" > pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" > pkt_dts_time="0.120000" best_effort_timestamp="6144" > best_effort_timestamp_time="0.120000" pkt_duration="2048" > pkt_duration_time="0.040000" pkt_pos="1024806" pkt_size="30000" width="100" > height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" > coded_picture_number="0" display_picture_number="0" interlaced_frame="0" > top_field_first="0" repeat_pict="0"/> > </packets_and_frames> > > -- > 2.8.0.rc3.226.g39d4020 > >
On Thu, Sep 15, 2016 at 01:36:19PM -0700, Sasi Inguva wrote: > Signed-off-by: Sasi Inguva <isasi@google.com> > --- > ffprobe.c | 3 +- > tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- > .../ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- > tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 242 ++++++++--------- > tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +++++----- > tests/ref/fate/concat-demuxer-simple2-lavf-ts | 298 ++++++++++----------- > tests/ref/fate/ffprobe_compact | 28 +- > tests/ref/fate/ffprobe_csv | 28 +- > tests/ref/fate/ffprobe_default | 28 +- > tests/ref/fate/ffprobe_flat | 28 +- > tests/ref/fate/ffprobe_ini | 28 +- > tests/ref/fate/ffprobe_json | 28 +- > tests/ref/fate/ffprobe_xml | 28 +- > 13 files changed, 442 insertions(+), 441 deletions(-) > > diff --git a/ffprobe.c b/ffprobe.c > index 657867d..e64c66e 100644 > --- a/ffprobe.c > +++ b/ffprobe.c > @@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p > print_val("size", pkt->size, unit_byte_str); > if (pkt->pos != -1) print_fmt ("pos", "%"PRId64, pkt->pos); > else print_str_opt("pos", "N/A"); > - print_fmt("flags", "%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_'); > + print_fmt("flags", "%c%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_', > + pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_'); applied thanks [...]
diff --git a/ffprobe.c b/ffprobe.c index 657867d..e64c66e 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p print_val("size", pkt->size, unit_byte_str); if (pkt->pos != -1) print_fmt ("pos", "%"PRId64, pkt->pos); else print_str_opt("pos", "N/A"); - print_fmt("flags", "%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_'); + print_fmt("flags", "%c%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_', + pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_'); if (pkt->side_data_elems) { int size; diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf b/tests/ref/fate/concat-demuxer-extended-lavf-mxf index b894938..f7905aa 100644 --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf @@ -1 +1 @@ -0aa1ca6ff6e2e5aa926454d22fdaecd5 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe +21eb3a629ff504b55c93a66879a31362 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 index b378a2d..0c49f1f 100644 --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 @@ -1 +1 @@ -14c2b8d8f82f261c9627b33c481c0e8c *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe +67a03ad49f1bd17131f751313639b61e *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf index 3fc7957..6bba76a 100644 --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf @@ -1,124 +1,124 @@ -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 +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|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001 1|pcm_s16le|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 diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 index 0ff1b04..75cac84 100644 --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 @@ -1,82 +1,82 @@ -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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2073600|K_|1 Strings Metadata|8 0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001 1|pcm_s16le|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 diff --git a/tests/ref/fate/concat-demuxer-simple2-lavf-ts b/tests/ref/fate/concat-demuxer-simple2-lavf-ts index 33337cf..4dfed4d 100644 --- a/tests/ref/fate/concat-demuxer-simple2-lavf-ts +++ b/tests/ref/fate/concat-demuxer-simple2-lavf-ts @@ -1,151 +1,151 @@ -video|1|982|0.010911|-2618|-0.029089|3600|0.040000|N/A|N/A|24815|564|K -video|1|4582|0.050911|982|0.010911|3600|0.040000|N/A|N/A|16443|27072|_ -video|1|8182|0.090911|4582|0.050911|3600|0.040000|N/A|N/A|14522|44932|_ -video|1|11782|0.130911|8182|0.090911|3600|0.040000|N/A|N/A|12636|60536|_ -video|1|15382|0.170911|11782|0.130911|3600|0.040000|N/A|N/A|13407|74260|_ -video|1|18982|0.210911|15382|0.170911|3600|0.040000|N/A|N/A|13106|88924|_ -video|1|22582|0.250911|18982|0.210911|3600|0.040000|N/A|N/A|12769|102836|_ -video|1|26182|0.290911|22582|0.250911|3600|0.040000|N/A|N/A|12037|116748|_ -audio|0|0|0.000000|0|0.000000|2351|0.026122|N/A|N/A|222|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|14112|130096|_ -video|1|33382|0.370911|29782|0.330911|3600|0.040000|N/A|N/A|13343|145324|_ -video|1|36982|0.410911|33382|0.370911|3600|0.040000|N/A|N/A|12149|162996|_ -video|1|40582|0.450911|36982|0.410911|3600|0.040000|N/A|N/A|12296|176344|_ -video|1|44182|0.490911|40582|0.450911|3600|0.040000|N/A|N/A|24800|189692|K -video|1|47782|0.530911|44182|0.490911|3600|0.040000|N/A|N/A|17454|216388|_ -video|1|51382|0.570911|47782|0.530911|3600|0.040000|N/A|N/A|15033|235000|_ -video|1|54982|0.610911|51382|0.570911|3600|0.040000|N/A|N/A|13463|251356|_ -video|1|58582|0.650911|54982|0.610911|3600|0.040000|N/A|N/A|12412|266020|_ -video|1|62182|0.690911|58582|0.650911|3600|0.040000|N/A|N/A|13469|279744|_ -audio|0|32915|0.365722|32915|0.365722|2351|0.026122|N/A|N/A|223|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|13850|294408|_ -video|1|69382|0.770911|65782|0.730911|3600|0.040000|N/A|N/A|12177|309448|_ -video|1|72982|0.810911|69382|0.770911|3600|0.040000|N/A|N/A|12706|325992|_ -video|1|76582|0.850911|72982|0.810911|3600|0.040000|N/A|N/A|10838|339528|_ -video|1|80182|0.890911|76582|0.850911|3600|0.040000|N/A|N/A|11300|351372|_ -audio|0|65829|0.731433|65829|0.731433|2351|0.026122|N/A|N/A|223|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|12692|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|24815|564|K -video|1|95564|1.061822|91964|1.021822|3600|0.040000|N/A|N/A|16443|27072|_ -video|1|99164|1.101822|95564|1.061822|3600|0.040000|N/A|N/A|14522|44932|_ -video|1|102764|1.141822|99164|1.101822|3600|0.040000|N/A|N/A|12636|60536|_ -video|1|106364|1.181822|102764|1.141822|3600|0.040000|N/A|N/A|13407|74260|_ -video|1|109964|1.221822|106364|1.181822|3600|0.040000|N/A|N/A|13106|88924|_ -video|1|113564|1.261822|109964|1.221822|3600|0.040000|N/A|N/A|12769|102836|_ -video|1|117164|1.301822|113564|1.261822|3600|0.040000|N/A|N/A|12037|116748|_ -audio|0|90982|1.010911|90982|1.010911|2351|0.026122|N/A|N/A|222|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|14112|130096|_ -video|1|124364|1.381822|120764|1.341822|3600|0.040000|N/A|N/A|13343|145324|_ -video|1|127964|1.421822|124364|1.381822|3600|0.040000|N/A|N/A|12149|162996|_ -video|1|131564|1.461822|127964|1.421822|3600|0.040000|N/A|N/A|12296|176344|_ -video|1|135164|1.501822|131564|1.461822|3600|0.040000|N/A|N/A|24800|189692|K -video|1|138764|1.541822|135164|1.501822|3600|0.040000|N/A|N/A|17454|216388|_ -video|1|142364|1.581822|138764|1.541822|3600|0.040000|N/A|N/A|15033|235000|_ -video|1|145964|1.621822|142364|1.581822|3600|0.040000|N/A|N/A|13463|251356|_ -video|1|149564|1.661822|145964|1.621822|3600|0.040000|N/A|N/A|12412|266020|_ -video|1|153164|1.701822|149564|1.661822|3600|0.040000|N/A|N/A|13469|279744|_ -audio|0|123897|1.376633|123897|1.376633|2351|0.026122|N/A|N/A|223|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|13850|294408|_ -video|1|160364|1.781822|156764|1.741822|3600|0.040000|N/A|N/A|12177|309448|_ -video|1|163964|1.821822|160364|1.781822|3600|0.040000|N/A|N/A|12706|325992|_ -video|1|167564|1.861822|163964|1.821822|3600|0.040000|N/A|N/A|10838|339528|_ -video|1|171164|1.901822|167564|1.861822|3600|0.040000|N/A|N/A|11300|351372|_ -audio|0|156811|1.742344|156811|1.742344|2351|0.026122|N/A|N/A|223|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|12692|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|12706|325992|_ -video|1|143182|1.590911|139582|1.550911|3600|0.040000|N/A|N/A|10838|339528|_ -video|1|146782|1.630911|143182|1.590911|3600|0.040000|N/A|N/A|11300|351372|_ -audio|0|132429|1.471433|132429|1.471433|2351|0.026122|N/A|N/A|223|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|12692|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|12149|162996|_ -video|1|164782|1.830911|161182|1.790911|3600|0.040000|N/A|N/A|12296|176344|_ -video|1|168382|1.870911|164782|1.830911|3600|0.040000|N/A|N/A|24800|189692|K -video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17454|216388|_ -video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15033|235000|_ +video|1|982|0.010911|-2618|-0.029089|3600|0.040000|N/A|N/A|24815|564|K_ +video|1|4582|0.050911|982|0.010911|3600|0.040000|N/A|N/A|16443|27072|__ +video|1|8182|0.090911|4582|0.050911|3600|0.040000|N/A|N/A|14522|44932|__ +video|1|11782|0.130911|8182|0.090911|3600|0.040000|N/A|N/A|12636|60536|__ +video|1|15382|0.170911|11782|0.130911|3600|0.040000|N/A|N/A|13407|74260|__ +video|1|18982|0.210911|15382|0.170911|3600|0.040000|N/A|N/A|13106|88924|__ +video|1|22582|0.250911|18982|0.210911|3600|0.040000|N/A|N/A|12769|102836|__ +video|1|26182|0.290911|22582|0.250911|3600|0.040000|N/A|N/A|12037|116748|__ +audio|0|0|0.000000|0|0.000000|2351|0.026122|N/A|N/A|222|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|14112|130096|__ +video|1|33382|0.370911|29782|0.330911|3600|0.040000|N/A|N/A|13343|145324|__ +video|1|36982|0.410911|33382|0.370911|3600|0.040000|N/A|N/A|12149|162996|__ +video|1|40582|0.450911|36982|0.410911|3600|0.040000|N/A|N/A|12296|176344|__ +video|1|44182|0.490911|40582|0.450911|3600|0.040000|N/A|N/A|24800|189692|K_ +video|1|47782|0.530911|44182|0.490911|3600|0.040000|N/A|N/A|17454|216388|__ +video|1|51382|0.570911|47782|0.530911|3600|0.040000|N/A|N/A|15033|235000|__ +video|1|54982|0.610911|51382|0.570911|3600|0.040000|N/A|N/A|13463|251356|__ +video|1|58582|0.650911|54982|0.610911|3600|0.040000|N/A|N/A|12412|266020|__ +video|1|62182|0.690911|58582|0.650911|3600|0.040000|N/A|N/A|13469|279744|__ +audio|0|32915|0.365722|32915|0.365722|2351|0.026122|N/A|N/A|223|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|13850|294408|__ +video|1|69382|0.770911|65782|0.730911|3600|0.040000|N/A|N/A|12177|309448|__ +video|1|72982|0.810911|69382|0.770911|3600|0.040000|N/A|N/A|12706|325992|__ +video|1|76582|0.850911|72982|0.810911|3600|0.040000|N/A|N/A|10838|339528|__ +video|1|80182|0.890911|76582|0.850911|3600|0.040000|N/A|N/A|11300|351372|__ +audio|0|65829|0.731433|65829|0.731433|2351|0.026122|N/A|N/A|223|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|12692|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|24815|564|K_ +video|1|95564|1.061822|91964|1.021822|3600|0.040000|N/A|N/A|16443|27072|__ +video|1|99164|1.101822|95564|1.061822|3600|0.040000|N/A|N/A|14522|44932|__ +video|1|102764|1.141822|99164|1.101822|3600|0.040000|N/A|N/A|12636|60536|__ +video|1|106364|1.181822|102764|1.141822|3600|0.040000|N/A|N/A|13407|74260|__ +video|1|109964|1.221822|106364|1.181822|3600|0.040000|N/A|N/A|13106|88924|__ +video|1|113564|1.261822|109964|1.221822|3600|0.040000|N/A|N/A|12769|102836|__ +video|1|117164|1.301822|113564|1.261822|3600|0.040000|N/A|N/A|12037|116748|__ +audio|0|90982|1.010911|90982|1.010911|2351|0.026122|N/A|N/A|222|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|14112|130096|__ +video|1|124364|1.381822|120764|1.341822|3600|0.040000|N/A|N/A|13343|145324|__ +video|1|127964|1.421822|124364|1.381822|3600|0.040000|N/A|N/A|12149|162996|__ +video|1|131564|1.461822|127964|1.421822|3600|0.040000|N/A|N/A|12296|176344|__ +video|1|135164|1.501822|131564|1.461822|3600|0.040000|N/A|N/A|24800|189692|K_ +video|1|138764|1.541822|135164|1.501822|3600|0.040000|N/A|N/A|17454|216388|__ +video|1|142364|1.581822|138764|1.541822|3600|0.040000|N/A|N/A|15033|235000|__ +video|1|145964|1.621822|142364|1.581822|3600|0.040000|N/A|N/A|13463|251356|__ +video|1|149564|1.661822|145964|1.621822|3600|0.040000|N/A|N/A|12412|266020|__ +video|1|153164|1.701822|149564|1.661822|3600|0.040000|N/A|N/A|13469|279744|__ +audio|0|123897|1.376633|123897|1.376633|2351|0.026122|N/A|N/A|223|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|13850|294408|__ +video|1|160364|1.781822|156764|1.741822|3600|0.040000|N/A|N/A|12177|309448|__ +video|1|163964|1.821822|160364|1.781822|3600|0.040000|N/A|N/A|12706|325992|__ +video|1|167564|1.861822|163964|1.821822|3600|0.040000|N/A|N/A|10838|339528|__ +video|1|171164|1.901822|167564|1.861822|3600|0.040000|N/A|N/A|11300|351372|__ +audio|0|156811|1.742344|156811|1.742344|2351|0.026122|N/A|N/A|223|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|12692|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|12706|325992|__ +video|1|143182|1.590911|139582|1.550911|3600|0.040000|N/A|N/A|10838|339528|__ +video|1|146782|1.630911|143182|1.590911|3600|0.040000|N/A|N/A|11300|351372|__ +audio|0|132429|1.471433|132429|1.471433|2351|0.026122|N/A|N/A|223|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|12692|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|12149|162996|__ +video|1|164782|1.830911|161182|1.790911|3600|0.040000|N/A|N/A|12296|176344|__ +video|1|168382|1.870911|164782|1.830911|3600|0.040000|N/A|N/A|24800|189692|K_ +video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17454|216388|__ +video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15033|235000|__ 0|mp2|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|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|N/A|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|0 diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index d529bb6..9a5f531 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -1,30 +1,30 @@ -packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=647|flags=K +packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=647|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=647|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2722|flags=K +packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2722|flags=K_ frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2722|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233143|flags=K +packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233143|flags=K_ frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233143|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263148|flags=K +packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263148|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|best_effort_timestamp=1024|best_effort_timestamp_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263148|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265226|flags=K +packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265226|flags=K_ frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265226|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495650|flags=K +packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495650|flags=K_ frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495650|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525655|flags=K +packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525655|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|best_effort_timestamp=2048|best_effort_timestamp_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525655|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527726|flags=K +packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527726|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|best_effort_timestamp=3072|best_effort_timestamp_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527726|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529804|flags=K +packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529804|flags=K_ frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529804|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760228|flags=K +packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760228|flags=K_ frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760228|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790233|flags=K +packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790233|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|best_effort_timestamp=4096|best_effort_timestamp_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790233|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792304|flags=K +packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792304|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|best_effort_timestamp=5120|best_effort_timestamp_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792304|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794382|flags=K +packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794382|flags=K_ frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794382|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024806|flags=K +packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024806|flags=K_ frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024806|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 882c1b8..c5bef51 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,30 +1,30 @@ -packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K +packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K_ frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,647,2048,s16,1024,1,unknown -packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K +packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K_ frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2722,230400,320,240,rgb24,1:1,I,0,0,0,0,0 -packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233143,K +packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233143,K_ frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233143,30000,100,100,rgb24,1:1,I,0,0,0,0,0 -packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263148,K +packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263148,K_ frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263148,2048,s16,1024,1,unknown -packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265226,K +packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265226,K_ frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265226,230400,320,240,rgb24,1:1,I,0,0,0,0,0 -packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495650,K +packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495650,K_ frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495650,30000,100,100,rgb24,1:1,I,0,0,0,0,0 -packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525655,K +packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525655,K_ frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525655,2048,s16,1024,1,unknown -packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527726,K +packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527726,K_ frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527726,2048,s16,1024,1,unknown -packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529804,K +packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529804,K_ frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529804,230400,320,240,rgb24,1:1,I,0,0,0,0,0 -packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760228,K +packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760228,K_ frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760228,30000,100,100,rgb24,1:1,I,0,0,0,0,0 -packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790233,K +packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790233,K_ frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790233,2048,s16,1024,1,unknown -packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792304,K +packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792304,K_ frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792304,2048,s16,1024,1,unknown -packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794382,K +packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794382,K_ frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794382,230400,320,240,rgb24,1:1,I,0,0,0,0,0 -packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024806,K +packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024806,K_ frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024806,30000,100,100,rgb24,1:1,I,0,0,0,0,0 stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,320,240,0,1:1,4:3,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 4adb330..35418d4 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -11,7 +11,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=647 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=audio @@ -45,7 +45,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=2722 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -85,7 +85,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=233143 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -125,7 +125,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=263148 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=audio @@ -159,7 +159,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=265226 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -199,7 +199,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=495650 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -239,7 +239,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=525655 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=audio @@ -273,7 +273,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=527726 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=audio @@ -307,7 +307,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=529804 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -347,7 +347,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=760228 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -387,7 +387,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=790233 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=audio @@ -421,7 +421,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=792304 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=audio @@ -455,7 +455,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=794382 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video @@ -495,7 +495,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=1024806 -flags=K +flags=K_ [/PACKET] [FRAME] media_type=video diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index 4b2c91a..f9755c2 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -10,7 +10,7 @@ packets_and_frames.packet.0.convergence_duration="N/A" packets_and_frames.packet.0.convergence_duration_time="N/A" packets_and_frames.packet.0.size="2048" packets_and_frames.packet.0.pos="647" -packets_and_frames.packet.0.flags="K" +packets_and_frames.packet.0.flags="K_" packets_and_frames.frame.0.media_type="audio" packets_and_frames.frame.0.stream_index=0 packets_and_frames.frame.0.key_frame=1 @@ -40,7 +40,7 @@ packets_and_frames.packet.1.convergence_duration="N/A" packets_and_frames.packet.1.convergence_duration_time="N/A" packets_and_frames.packet.1.size="230400" packets_and_frames.packet.1.pos="2722" -packets_and_frames.packet.1.flags="K" +packets_and_frames.packet.1.flags="K_" packets_and_frames.frame.1.media_type="video" packets_and_frames.frame.1.stream_index=1 packets_and_frames.frame.1.key_frame=1 @@ -76,7 +76,7 @@ packets_and_frames.packet.2.convergence_duration="N/A" packets_and_frames.packet.2.convergence_duration_time="N/A" packets_and_frames.packet.2.size="30000" packets_and_frames.packet.2.pos="233143" -packets_and_frames.packet.2.flags="K" +packets_and_frames.packet.2.flags="K_" packets_and_frames.frame.2.media_type="video" packets_and_frames.frame.2.stream_index=2 packets_and_frames.frame.2.key_frame=1 @@ -112,7 +112,7 @@ packets_and_frames.packet.3.convergence_duration="N/A" packets_and_frames.packet.3.convergence_duration_time="N/A" packets_and_frames.packet.3.size="2048" packets_and_frames.packet.3.pos="263148" -packets_and_frames.packet.3.flags="K" +packets_and_frames.packet.3.flags="K_" packets_and_frames.frame.3.media_type="audio" packets_and_frames.frame.3.stream_index=0 packets_and_frames.frame.3.key_frame=1 @@ -142,7 +142,7 @@ packets_and_frames.packet.4.convergence_duration="N/A" packets_and_frames.packet.4.convergence_duration_time="N/A" packets_and_frames.packet.4.size="230400" packets_and_frames.packet.4.pos="265226" -packets_and_frames.packet.4.flags="K" +packets_and_frames.packet.4.flags="K_" packets_and_frames.frame.4.media_type="video" packets_and_frames.frame.4.stream_index=1 packets_and_frames.frame.4.key_frame=1 @@ -178,7 +178,7 @@ packets_and_frames.packet.5.convergence_duration="N/A" packets_and_frames.packet.5.convergence_duration_time="N/A" packets_and_frames.packet.5.size="30000" packets_and_frames.packet.5.pos="495650" -packets_and_frames.packet.5.flags="K" +packets_and_frames.packet.5.flags="K_" packets_and_frames.frame.5.media_type="video" packets_and_frames.frame.5.stream_index=2 packets_and_frames.frame.5.key_frame=1 @@ -214,7 +214,7 @@ packets_and_frames.packet.6.convergence_duration="N/A" packets_and_frames.packet.6.convergence_duration_time="N/A" packets_and_frames.packet.6.size="2048" packets_and_frames.packet.6.pos="525655" -packets_and_frames.packet.6.flags="K" +packets_and_frames.packet.6.flags="K_" packets_and_frames.frame.6.media_type="audio" packets_and_frames.frame.6.stream_index=0 packets_and_frames.frame.6.key_frame=1 @@ -244,7 +244,7 @@ packets_and_frames.packet.7.convergence_duration="N/A" packets_and_frames.packet.7.convergence_duration_time="N/A" packets_and_frames.packet.7.size="2048" packets_and_frames.packet.7.pos="527726" -packets_and_frames.packet.7.flags="K" +packets_and_frames.packet.7.flags="K_" packets_and_frames.frame.7.media_type="audio" packets_and_frames.frame.7.stream_index=0 packets_and_frames.frame.7.key_frame=1 @@ -274,7 +274,7 @@ packets_and_frames.packet.8.convergence_duration="N/A" packets_and_frames.packet.8.convergence_duration_time="N/A" packets_and_frames.packet.8.size="230400" packets_and_frames.packet.8.pos="529804" -packets_and_frames.packet.8.flags="K" +packets_and_frames.packet.8.flags="K_" packets_and_frames.frame.8.media_type="video" packets_and_frames.frame.8.stream_index=1 packets_and_frames.frame.8.key_frame=1 @@ -310,7 +310,7 @@ packets_and_frames.packet.9.convergence_duration="N/A" packets_and_frames.packet.9.convergence_duration_time="N/A" packets_and_frames.packet.9.size="30000" packets_and_frames.packet.9.pos="760228" -packets_and_frames.packet.9.flags="K" +packets_and_frames.packet.9.flags="K_" packets_and_frames.frame.9.media_type="video" packets_and_frames.frame.9.stream_index=2 packets_and_frames.frame.9.key_frame=1 @@ -346,7 +346,7 @@ packets_and_frames.packet.10.convergence_duration="N/A" packets_and_frames.packet.10.convergence_duration_time="N/A" packets_and_frames.packet.10.size="2048" packets_and_frames.packet.10.pos="790233" -packets_and_frames.packet.10.flags="K" +packets_and_frames.packet.10.flags="K_" packets_and_frames.frame.10.media_type="audio" packets_and_frames.frame.10.stream_index=0 packets_and_frames.frame.10.key_frame=1 @@ -376,7 +376,7 @@ packets_and_frames.packet.11.convergence_duration="N/A" packets_and_frames.packet.11.convergence_duration_time="N/A" packets_and_frames.packet.11.size="2048" packets_and_frames.packet.11.pos="792304" -packets_and_frames.packet.11.flags="K" +packets_and_frames.packet.11.flags="K_" packets_and_frames.frame.11.media_type="audio" packets_and_frames.frame.11.stream_index=0 packets_and_frames.frame.11.key_frame=1 @@ -406,7 +406,7 @@ packets_and_frames.packet.12.convergence_duration="N/A" packets_and_frames.packet.12.convergence_duration_time="N/A" packets_and_frames.packet.12.size="230400" packets_and_frames.packet.12.pos="794382" -packets_and_frames.packet.12.flags="K" +packets_and_frames.packet.12.flags="K_" packets_and_frames.frame.12.media_type="video" packets_and_frames.frame.12.stream_index=1 packets_and_frames.frame.12.key_frame=1 @@ -442,7 +442,7 @@ packets_and_frames.packet.13.convergence_duration="N/A" packets_and_frames.packet.13.convergence_duration_time="N/A" packets_and_frames.packet.13.size="30000" packets_and_frames.packet.13.pos="1024806" -packets_and_frames.packet.13.flags="K" +packets_and_frames.packet.13.flags="K_" packets_and_frames.frame.13.media_type="video" packets_and_frames.frame.13.stream_index=2 packets_and_frames.frame.13.key_frame=1 diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index ba59d61..472ec72 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -13,7 +13,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=647 -flags=K +flags=K_ [packets_and_frames.frame.0] media_type=audio @@ -47,7 +47,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=2722 -flags=K +flags=K_ [packets_and_frames.frame.1] media_type=video @@ -87,7 +87,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=233143 -flags=K +flags=K_ [packets_and_frames.frame.2] media_type=video @@ -127,7 +127,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=263148 -flags=K +flags=K_ [packets_and_frames.frame.3] media_type=audio @@ -161,7 +161,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=265226 -flags=K +flags=K_ [packets_and_frames.frame.4] media_type=video @@ -201,7 +201,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=495650 -flags=K +flags=K_ [packets_and_frames.frame.5] media_type=video @@ -241,7 +241,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=525655 -flags=K +flags=K_ [packets_and_frames.frame.6] media_type=audio @@ -275,7 +275,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=527726 -flags=K +flags=K_ [packets_and_frames.frame.7] media_type=audio @@ -309,7 +309,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=529804 -flags=K +flags=K_ [packets_and_frames.frame.8] media_type=video @@ -349,7 +349,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=760228 -flags=K +flags=K_ [packets_and_frames.frame.9] media_type=video @@ -389,7 +389,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=790233 -flags=K +flags=K_ [packets_and_frames.frame.10] media_type=audio @@ -423,7 +423,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=2048 pos=792304 -flags=K +flags=K_ [packets_and_frames.frame.11] media_type=audio @@ -457,7 +457,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=230400 pos=794382 -flags=K +flags=K_ [packets_and_frames.frame.12] media_type=video @@ -497,7 +497,7 @@ convergence_duration=N/A convergence_duration_time=N/A size=30000 pos=1024806 -flags=K +flags=K_ [packets_and_frames.frame.13] media_type=video diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index 8d7abda..e9ef1f0 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -12,7 +12,7 @@ "duration_time": "0.023220", "size": "2048", "pos": "647", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -45,7 +45,7 @@ "duration_time": "0.040000", "size": "230400", "pos": "2722", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -85,7 +85,7 @@ "duration_time": "0.040000", "size": "30000", "pos": "233143", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -125,7 +125,7 @@ "duration_time": "0.023220", "size": "2048", "pos": "263148", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -158,7 +158,7 @@ "duration_time": "0.040000", "size": "230400", "pos": "265226", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -198,7 +198,7 @@ "duration_time": "0.040000", "size": "30000", "pos": "495650", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -238,7 +238,7 @@ "duration_time": "0.023220", "size": "2048", "pos": "525655", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -271,7 +271,7 @@ "duration_time": "0.023220", "size": "2048", "pos": "527726", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -304,7 +304,7 @@ "duration_time": "0.040000", "size": "230400", "pos": "529804", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -344,7 +344,7 @@ "duration_time": "0.040000", "size": "30000", "pos": "760228", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -384,7 +384,7 @@ "duration_time": "0.023220", "size": "2048", "pos": "790233", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -417,7 +417,7 @@ "duration_time": "0.023220", "size": "2048", "pos": "792304", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -450,7 +450,7 @@ "duration_time": "0.040000", "size": "230400", "pos": "794382", - "flags": "K" + "flags": "K_" }, { "type": "frame", @@ -490,7 +490,7 @@ "duration_time": "0.040000", "size": "30000", "pos": "1024806", - "flags": "K" + "flags": "K_" }, { "type": "frame", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index b51b0c6..4639a23 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <ffprobe> <packets_and_frames> - <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="647" flags="K"/> + <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="647" flags="K_"/> <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="647" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2722" flags="K"/> + <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2722" flags="K_"/> <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2722" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233143" flags="K"/> + <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233143" flags="K_"/> <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233143" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263148" flags="K"/> + <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263148" flags="K_"/> <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" best_effort_timestamp="1024" best_effort_timestamp_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263148" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265226" flags="K"/> + <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265226" flags="K_"/> <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265226" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495650" flags="K"/> + <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495650" flags="K_"/> <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495650" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525655" flags="K"/> + <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525655" flags="K_"/> <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" best_effort_timestamp="2048" best_effort_timestamp_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525655" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527726" flags="K"/> + <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527726" flags="K_"/> <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" best_effort_timestamp="3072" best_effort_timestamp_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527726" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529804" flags="K"/> + <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529804" flags="K_"/> <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529804" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760228" flags="K"/> + <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760228" flags="K_"/> <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760228" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790233" flags="K"/> + <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790233" flags="K_"/> <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" best_effort_timestamp="4096" best_effort_timestamp_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790233" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792304" flags="K"/> + <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792304" flags="K_"/> <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" best_effort_timestamp="5120" best_effort_timestamp_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792304" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794382" flags="K"/> + <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794382" flags="K_"/> <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794382" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> - <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024806" flags="K"/> + <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024806" flags="K_"/> <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024806" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> </packets_and_frames>
Signed-off-by: Sasi Inguva <isasi@google.com> --- ffprobe.c | 3 +- tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- .../ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 242 ++++++++--------- tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +++++----- tests/ref/fate/concat-demuxer-simple2-lavf-ts | 298 ++++++++++----------- tests/ref/fate/ffprobe_compact | 28 +- tests/ref/fate/ffprobe_csv | 28 +- tests/ref/fate/ffprobe_default | 28 +- tests/ref/fate/ffprobe_flat | 28 +- tests/ref/fate/ffprobe_ini | 28 +- tests/ref/fate/ffprobe_json | 28 +- tests/ref/fate/ffprobe_xml | 28 +- 13 files changed, 442 insertions(+), 441 deletions(-)