[FFmpeg-cvslog] fate/ffprobe: add some stream metadata.
Clément Bœsch
git at videolan.org
Mon Oct 8 11:04:02 CEST 2012
ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Thu Sep 27 09:49:56 2012 +0200| [208a5d13228208caea10d96353693c39d08a1211] | committer: Clément Bœsch
fate/ffprobe: add some stream metadata.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=208a5d13228208caea10d96353693c39d08a1211
---
tests/Makefile | 1 +
tests/ref/fate/ffprobe_compact | 64 ++++++++++++++++----------------
tests/ref/fate/ffprobe_csv | 64 ++++++++++++++++----------------
tests/ref/fate/ffprobe_default | 75 ++++++++++++++++++++------------------
tests/ref/fate/ffprobe_flat | 75 ++++++++++++++++++++------------------
tests/ref/fate/ffprobe_ini | 79 ++++++++++++++++++++++------------------
tests/ref/fate/ffprobe_json | 79 ++++++++++++++++++++++------------------
tests/ref/fate/ffprobe_xml | 67 ++++++++++++++++++----------------
tests/test.ffmeta | 5 +++
9 files changed, 269 insertions(+), 240 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 4db9449..f4b5821 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -35,6 +35,7 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data
-f lavfi -i "aevalsrc=sin(400*PI*2*t)::d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \
-f ffmetadata -i $(SRC_PATH)/tests/test.ffmeta \
-flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
+ -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \
-vcodec rawvideo -acodec pcm_s16le \
-y $@ 2>/dev/null
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
index bb5be42..a276848 100644
--- a/tests/ref/fate/ffprobe_compact
+++ b/tests/ref/fate/ffprobe_compact
@@ -1,32 +1,32 @@
-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=487|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=487|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=2562|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2562|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|reference=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=232983|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=232983|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|reference=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=262988|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=262988|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=265066|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265066|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|reference=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=495490|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495490|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|reference=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=525495|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525495|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=527566|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527566|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=529644|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529644|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|reference=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=760068|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760068|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|reference=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=790073|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790073|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=792144|flags=K
-frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792144|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=794222|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794222|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|reference=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=1024646|flags=K
-frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024646|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|reference=0
-stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=[1][0][0][0]|codec_tag=0x0001|sample_fmt=s16|sample_rate=44100|channels=1|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=527364|duration=11.958367|bit_rate=705600|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
-stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|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=612268|duration=11.958359|bit_rate=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
-stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|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=612268|duration=11.958359|bit_rate=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
-format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=11.958367|size=1054727|bit_rate=705599|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
+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=572|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=572|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=2647|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2647|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|reference=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=233068|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233068|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|reference=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=263073|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263073|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=265151|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265151|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|reference=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=495575|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495575|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|reference=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=525580|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525580|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=527651|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527651|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=529729|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529729|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|reference=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=760153|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760153|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|reference=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=790158|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790158|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=792229|flags=K
+frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792229|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=794307|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794307|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|reference=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=1024731|flags=K
+frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024731|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|reference=0
+stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=[1][0][0][0]|codec_tag=0x0001|sample_fmt=s16|sample_rate=44100|channels=1|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=527406|duration=11.959320|bit_rate=705600|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²
+stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|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=612317|duration=11.959316|bit_rate=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
+stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|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=612317|duration=11.959316|bit_rate=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
+format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=11.959320|size=1054812|bit_rate=705599|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv
index 23183fc..7a09d65 100644
--- a/tests/ref/fate/ffprobe_csv
+++ b/tests/ref/fate/ffprobe_csv
@@ -1,32 +1,32 @@
-packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,487,K
-frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,487,s16,1024,1,unknown
-packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2562,K
-frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2562,320,240,rgb24,1:1,I,0,0,0,0,0,0
-packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,232983,K
-frame,video,1,0,0.000000,0,0.000000,2048,0.040000,232983,100,100,rgb24,1:1,I,0,0,0,0,0,0
-packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,262988,K
-frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,262988,s16,1024,1,unknown
-packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265066,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265066,320,240,rgb24,1:1,I,0,0,0,0,0,0
-packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495490,K
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495490,100,100,rgb24,1:1,I,0,0,0,0,0,0
-packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525495,K
-frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525495,s16,1024,1,unknown
-packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527566,K
-frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527566,s16,1024,1,unknown
-packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529644,K
-frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529644,320,240,rgb24,1:1,I,0,0,0,0,0,0
-packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760068,K
-frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760068,100,100,rgb24,1:1,I,0,0,0,0,0,0
-packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790073,K
-frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790073,s16,1024,1,unknown
-packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792144,K
-frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792144,s16,1024,1,unknown
-packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794222,K
-frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794222,320,240,rgb24,1:1,I,0,0,0,0,0,0
-packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024646,K
-frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024646,100,100,rgb24,1:1,I,0,0,0,0,0,0
-stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527364,11.958367,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0
-stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612268,11.958359,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0
-stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612268,11.958359,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0
-format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.958367,1054727,705599,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
+packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K
+frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,s16,1024,1,unknown
+packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K
+frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,320,240,rgb24,1:1,I,0,0,0,0,0,0
+packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233068,K
+frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,100,100,rgb24,1:1,I,0,0,0,0,0,0
+packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263073,K
+frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,s16,1024,1,unknown
+packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,320,240,rgb24,1:1,I,0,0,0,0,0,0
+packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495575,K
+frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,100,100,rgb24,1:1,I,0,0,0,0,0,0
+packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525580,K
+frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,s16,1024,1,unknown
+packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K
+frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,s16,1024,1,unknown
+packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K
+frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,320,240,rgb24,1:1,I,0,0,0,0,0,0
+packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760153,K
+frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,100,100,rgb24,1:1,I,0,0,0,0,0,0
+packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790158,K
+frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,s16,1024,1,unknown
+packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K
+frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,s16,1024,1,unknown
+packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K
+frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,320,240,rgb24,1:1,I,0,0,0,0,0,0
+packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024731,K
+frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,100,100,rgb24,1:1,I,0,0,0,0,0,0
+stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527406,11.959320,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²
+stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt
+stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0
+format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.959320,1054812,705599,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
index a8ddaea..585f340 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -10,7 +10,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=487
+pos=572
flags=K
[/PACKET]
[FRAME]
@@ -22,7 +22,7 @@ pkt_dts=0
pkt_dts_time=0.000000
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=487
+pkt_pos=572
sample_fmt=s16
nb_samples=1024
channels=1
@@ -40,7 +40,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=2562
+pos=2647
flags=K
[/PACKET]
[FRAME]
@@ -52,7 +52,7 @@ pkt_dts=0
pkt_dts_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=2562
+pkt_pos=2647
width=320
height=240
pix_fmt=rgb24
@@ -77,7 +77,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=232983
+pos=233068
flags=K
[/PACKET]
[FRAME]
@@ -89,7 +89,7 @@ pkt_dts=0
pkt_dts_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=232983
+pkt_pos=233068
width=100
height=100
pix_fmt=rgb24
@@ -114,7 +114,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=262988
+pos=263073
flags=K
[/PACKET]
[FRAME]
@@ -126,7 +126,7 @@ pkt_dts=1024
pkt_dts_time=0.023220
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=262988
+pkt_pos=263073
sample_fmt=s16
nb_samples=1024
channels=1
@@ -144,7 +144,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=265066
+pos=265151
flags=K
[/PACKET]
[FRAME]
@@ -156,7 +156,7 @@ pkt_dts=2048
pkt_dts_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=265066
+pkt_pos=265151
width=320
height=240
pix_fmt=rgb24
@@ -181,7 +181,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=495490
+pos=495575
flags=K
[/PACKET]
[FRAME]
@@ -193,7 +193,7 @@ pkt_dts=2048
pkt_dts_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=495490
+pkt_pos=495575
width=100
height=100
pix_fmt=rgb24
@@ -218,7 +218,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=525495
+pos=525580
flags=K
[/PACKET]
[FRAME]
@@ -230,7 +230,7 @@ pkt_dts=2048
pkt_dts_time=0.046440
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=525495
+pkt_pos=525580
sample_fmt=s16
nb_samples=1024
channels=1
@@ -248,7 +248,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=527566
+pos=527651
flags=K
[/PACKET]
[FRAME]
@@ -260,7 +260,7 @@ pkt_dts=3072
pkt_dts_time=0.069660
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=527566
+pkt_pos=527651
sample_fmt=s16
nb_samples=1024
channels=1
@@ -278,7 +278,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=529644
+pos=529729
flags=K
[/PACKET]
[FRAME]
@@ -290,7 +290,7 @@ pkt_dts=4096
pkt_dts_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=529644
+pkt_pos=529729
width=320
height=240
pix_fmt=rgb24
@@ -315,7 +315,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=760068
+pos=760153
flags=K
[/PACKET]
[FRAME]
@@ -327,7 +327,7 @@ pkt_dts=4096
pkt_dts_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=760068
+pkt_pos=760153
width=100
height=100
pix_fmt=rgb24
@@ -352,7 +352,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=790073
+pos=790158
flags=K
[/PACKET]
[FRAME]
@@ -364,7 +364,7 @@ pkt_dts=4096
pkt_dts_time=0.092880
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=790073
+pkt_pos=790158
sample_fmt=s16
nb_samples=1024
channels=1
@@ -382,7 +382,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=792144
+pos=792229
flags=K
[/PACKET]
[FRAME]
@@ -394,7 +394,7 @@ pkt_dts=5120
pkt_dts_time=0.116100
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=792144
+pkt_pos=792229
sample_fmt=s16
nb_samples=1024
channels=1
@@ -412,7 +412,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=794222
+pos=794307
flags=K
[/PACKET]
[FRAME]
@@ -424,7 +424,7 @@ pkt_dts=6144
pkt_dts_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=794222
+pkt_pos=794307
width=320
height=240
pix_fmt=rgb24
@@ -449,7 +449,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=1024646
+pos=1024731
flags=K
[/PACKET]
[FRAME]
@@ -461,7 +461,7 @@ pkt_dts=6144
pkt_dts_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=1024646
+pkt_pos=1024731
width=100
height=100
pix_fmt=rgb24
@@ -492,8 +492,8 @@ avg_frame_rate=0/0
time_base=1/44100
start_pts=0
start_time=0.000000
-duration_ts=527364
-duration=11.958367
+duration_ts=527406
+duration=11.959320
bit_rate=705600
nb_frames=N/A
nb_read_frames=6
@@ -509,6 +509,7 @@ DISPOSITION:hearing_impaired=0
DISPOSITION:visual_impaired=0
DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0
+TAG:E=mc²
[/STREAM]
[STREAM]
index=1
@@ -532,8 +533,8 @@ avg_frame_rate=25/1
time_base=1/51200
start_pts=0
start_time=0.000000
-duration_ts=612268
-duration=11.958359
+duration_ts=612317
+duration=11.959316
bit_rate=N/A
nb_frames=N/A
nb_read_frames=4
@@ -549,6 +550,8 @@ 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
[/STREAM]
[STREAM]
index=2
@@ -572,8 +575,8 @@ avg_frame_rate=25/1
time_base=1/51200
start_pts=0
start_time=0.000000
-duration_ts=612268
-duration=11.958359
+duration_ts=612317
+duration=11.959316
bit_rate=N/A
nb_frames=N/A
nb_read_frames=4
@@ -595,8 +598,8 @@ filename=tests/data/ffprobe-test.nut
nb_streams=3
format_name=nut
start_time=0.000000
-duration=11.958367
-size=1054727
+duration=11.959320
+size=1054812
bit_rate=705599
TAG:title=ffprobe test file
TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">
diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat
index 493c976..010f669 100644
--- a/tests/ref/fate/ffprobe_flat
+++ b/tests/ref/fate/ffprobe_flat
@@ -9,7 +9,7 @@ packets_and_frames.packet.0.duration_time="0.023220"
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="487"
+packets_and_frames.packet.0.pos="572"
packets_and_frames.packet.0.flags="K"
packets_and_frames.frame.0.media_type="audio"
packets_and_frames.frame.0.key_frame=1
@@ -19,7 +19,7 @@ packets_and_frames.frame.0.pkt_dts=0
packets_and_frames.frame.0.pkt_dts_time="0.000000"
packets_and_frames.frame.0.pkt_duration=1024
packets_and_frames.frame.0.pkt_duration_time="0.023220"
-packets_and_frames.frame.0.pkt_pos="487"
+packets_and_frames.frame.0.pkt_pos="572"
packets_and_frames.frame.0.sample_fmt="s16"
packets_and_frames.frame.0.nb_samples=1024
packets_and_frames.frame.0.channels=1
@@ -35,7 +35,7 @@ packets_and_frames.packet.1.duration_time="0.040000"
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="2562"
+packets_and_frames.packet.1.pos="2647"
packets_and_frames.packet.1.flags="K"
packets_and_frames.frame.1.media_type="video"
packets_and_frames.frame.1.key_frame=1
@@ -45,7 +45,7 @@ packets_and_frames.frame.1.pkt_dts=0
packets_and_frames.frame.1.pkt_dts_time="0.000000"
packets_and_frames.frame.1.pkt_duration=2048
packets_and_frames.frame.1.pkt_duration_time="0.040000"
-packets_and_frames.frame.1.pkt_pos="2562"
+packets_and_frames.frame.1.pkt_pos="2647"
packets_and_frames.frame.1.width=320
packets_and_frames.frame.1.height=240
packets_and_frames.frame.1.pix_fmt="rgb24"
@@ -68,7 +68,7 @@ packets_and_frames.packet.2.duration_time="0.040000"
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="232983"
+packets_and_frames.packet.2.pos="233068"
packets_and_frames.packet.2.flags="K"
packets_and_frames.frame.2.media_type="video"
packets_and_frames.frame.2.key_frame=1
@@ -78,7 +78,7 @@ packets_and_frames.frame.2.pkt_dts=0
packets_and_frames.frame.2.pkt_dts_time="0.000000"
packets_and_frames.frame.2.pkt_duration=2048
packets_and_frames.frame.2.pkt_duration_time="0.040000"
-packets_and_frames.frame.2.pkt_pos="232983"
+packets_and_frames.frame.2.pkt_pos="233068"
packets_and_frames.frame.2.width=100
packets_and_frames.frame.2.height=100
packets_and_frames.frame.2.pix_fmt="rgb24"
@@ -101,7 +101,7 @@ packets_and_frames.packet.3.duration_time="0.023220"
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="262988"
+packets_and_frames.packet.3.pos="263073"
packets_and_frames.packet.3.flags="K"
packets_and_frames.frame.3.media_type="audio"
packets_and_frames.frame.3.key_frame=1
@@ -111,7 +111,7 @@ packets_and_frames.frame.3.pkt_dts=1024
packets_and_frames.frame.3.pkt_dts_time="0.023220"
packets_and_frames.frame.3.pkt_duration=1024
packets_and_frames.frame.3.pkt_duration_time="0.023220"
-packets_and_frames.frame.3.pkt_pos="262988"
+packets_and_frames.frame.3.pkt_pos="263073"
packets_and_frames.frame.3.sample_fmt="s16"
packets_and_frames.frame.3.nb_samples=1024
packets_and_frames.frame.3.channels=1
@@ -127,7 +127,7 @@ packets_and_frames.packet.4.duration_time="0.040000"
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="265066"
+packets_and_frames.packet.4.pos="265151"
packets_and_frames.packet.4.flags="K"
packets_and_frames.frame.4.media_type="video"
packets_and_frames.frame.4.key_frame=1
@@ -137,7 +137,7 @@ packets_and_frames.frame.4.pkt_dts=2048
packets_and_frames.frame.4.pkt_dts_time="0.040000"
packets_and_frames.frame.4.pkt_duration=2048
packets_and_frames.frame.4.pkt_duration_time="0.040000"
-packets_and_frames.frame.4.pkt_pos="265066"
+packets_and_frames.frame.4.pkt_pos="265151"
packets_and_frames.frame.4.width=320
packets_and_frames.frame.4.height=240
packets_and_frames.frame.4.pix_fmt="rgb24"
@@ -160,7 +160,7 @@ packets_and_frames.packet.5.duration_time="0.040000"
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="495490"
+packets_and_frames.packet.5.pos="495575"
packets_and_frames.packet.5.flags="K"
packets_and_frames.frame.5.media_type="video"
packets_and_frames.frame.5.key_frame=1
@@ -170,7 +170,7 @@ packets_and_frames.frame.5.pkt_dts=2048
packets_and_frames.frame.5.pkt_dts_time="0.040000"
packets_and_frames.frame.5.pkt_duration=2048
packets_and_frames.frame.5.pkt_duration_time="0.040000"
-packets_and_frames.frame.5.pkt_pos="495490"
+packets_and_frames.frame.5.pkt_pos="495575"
packets_and_frames.frame.5.width=100
packets_and_frames.frame.5.height=100
packets_and_frames.frame.5.pix_fmt="rgb24"
@@ -193,7 +193,7 @@ packets_and_frames.packet.6.duration_time="0.023220"
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="525495"
+packets_and_frames.packet.6.pos="525580"
packets_and_frames.packet.6.flags="K"
packets_and_frames.frame.6.media_type="audio"
packets_and_frames.frame.6.key_frame=1
@@ -203,7 +203,7 @@ packets_and_frames.frame.6.pkt_dts=2048
packets_and_frames.frame.6.pkt_dts_time="0.046440"
packets_and_frames.frame.6.pkt_duration=1024
packets_and_frames.frame.6.pkt_duration_time="0.023220"
-packets_and_frames.frame.6.pkt_pos="525495"
+packets_and_frames.frame.6.pkt_pos="525580"
packets_and_frames.frame.6.sample_fmt="s16"
packets_and_frames.frame.6.nb_samples=1024
packets_and_frames.frame.6.channels=1
@@ -219,7 +219,7 @@ packets_and_frames.packet.7.duration_time="0.023220"
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="527566"
+packets_and_frames.packet.7.pos="527651"
packets_and_frames.packet.7.flags="K"
packets_and_frames.frame.7.media_type="audio"
packets_and_frames.frame.7.key_frame=1
@@ -229,7 +229,7 @@ packets_and_frames.frame.7.pkt_dts=3072
packets_and_frames.frame.7.pkt_dts_time="0.069660"
packets_and_frames.frame.7.pkt_duration=1024
packets_and_frames.frame.7.pkt_duration_time="0.023220"
-packets_and_frames.frame.7.pkt_pos="527566"
+packets_and_frames.frame.7.pkt_pos="527651"
packets_and_frames.frame.7.sample_fmt="s16"
packets_and_frames.frame.7.nb_samples=1024
packets_and_frames.frame.7.channels=1
@@ -245,7 +245,7 @@ packets_and_frames.packet.8.duration_time="0.040000"
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="529644"
+packets_and_frames.packet.8.pos="529729"
packets_and_frames.packet.8.flags="K"
packets_and_frames.frame.8.media_type="video"
packets_and_frames.frame.8.key_frame=1
@@ -255,7 +255,7 @@ packets_and_frames.frame.8.pkt_dts=4096
packets_and_frames.frame.8.pkt_dts_time="0.080000"
packets_and_frames.frame.8.pkt_duration=2048
packets_and_frames.frame.8.pkt_duration_time="0.040000"
-packets_and_frames.frame.8.pkt_pos="529644"
+packets_and_frames.frame.8.pkt_pos="529729"
packets_and_frames.frame.8.width=320
packets_and_frames.frame.8.height=240
packets_and_frames.frame.8.pix_fmt="rgb24"
@@ -278,7 +278,7 @@ packets_and_frames.packet.9.duration_time="0.040000"
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="760068"
+packets_and_frames.packet.9.pos="760153"
packets_and_frames.packet.9.flags="K"
packets_and_frames.frame.9.media_type="video"
packets_and_frames.frame.9.key_frame=1
@@ -288,7 +288,7 @@ packets_and_frames.frame.9.pkt_dts=4096
packets_and_frames.frame.9.pkt_dts_time="0.080000"
packets_and_frames.frame.9.pkt_duration=2048
packets_and_frames.frame.9.pkt_duration_time="0.040000"
-packets_and_frames.frame.9.pkt_pos="760068"
+packets_and_frames.frame.9.pkt_pos="760153"
packets_and_frames.frame.9.width=100
packets_and_frames.frame.9.height=100
packets_and_frames.frame.9.pix_fmt="rgb24"
@@ -311,7 +311,7 @@ packets_and_frames.packet.10.duration_time="0.023220"
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="790073"
+packets_and_frames.packet.10.pos="790158"
packets_and_frames.packet.10.flags="K"
packets_and_frames.frame.10.media_type="audio"
packets_and_frames.frame.10.key_frame=1
@@ -321,7 +321,7 @@ packets_and_frames.frame.10.pkt_dts=4096
packets_and_frames.frame.10.pkt_dts_time="0.092880"
packets_and_frames.frame.10.pkt_duration=1024
packets_and_frames.frame.10.pkt_duration_time="0.023220"
-packets_and_frames.frame.10.pkt_pos="790073"
+packets_and_frames.frame.10.pkt_pos="790158"
packets_and_frames.frame.10.sample_fmt="s16"
packets_and_frames.frame.10.nb_samples=1024
packets_and_frames.frame.10.channels=1
@@ -337,7 +337,7 @@ packets_and_frames.packet.11.duration_time="0.023220"
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="792144"
+packets_and_frames.packet.11.pos="792229"
packets_and_frames.packet.11.flags="K"
packets_and_frames.frame.11.media_type="audio"
packets_and_frames.frame.11.key_frame=1
@@ -347,7 +347,7 @@ packets_and_frames.frame.11.pkt_dts=5120
packets_and_frames.frame.11.pkt_dts_time="0.116100"
packets_and_frames.frame.11.pkt_duration=1024
packets_and_frames.frame.11.pkt_duration_time="0.023220"
-packets_and_frames.frame.11.pkt_pos="792144"
+packets_and_frames.frame.11.pkt_pos="792229"
packets_and_frames.frame.11.sample_fmt="s16"
packets_and_frames.frame.11.nb_samples=1024
packets_and_frames.frame.11.channels=1
@@ -363,7 +363,7 @@ packets_and_frames.packet.12.duration_time="0.040000"
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="794222"
+packets_and_frames.packet.12.pos="794307"
packets_and_frames.packet.12.flags="K"
packets_and_frames.frame.12.media_type="video"
packets_and_frames.frame.12.key_frame=1
@@ -373,7 +373,7 @@ packets_and_frames.frame.12.pkt_dts=6144
packets_and_frames.frame.12.pkt_dts_time="0.120000"
packets_and_frames.frame.12.pkt_duration=2048
packets_and_frames.frame.12.pkt_duration_time="0.040000"
-packets_and_frames.frame.12.pkt_pos="794222"
+packets_and_frames.frame.12.pkt_pos="794307"
packets_and_frames.frame.12.width=320
packets_and_frames.frame.12.height=240
packets_and_frames.frame.12.pix_fmt="rgb24"
@@ -396,7 +396,7 @@ packets_and_frames.packet.13.duration_time="0.040000"
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="1024646"
+packets_and_frames.packet.13.pos="1024731"
packets_and_frames.packet.13.flags="K"
packets_and_frames.frame.13.media_type="video"
packets_and_frames.frame.13.key_frame=1
@@ -406,7 +406,7 @@ packets_and_frames.frame.13.pkt_dts=6144
packets_and_frames.frame.13.pkt_dts_time="0.120000"
packets_and_frames.frame.13.pkt_duration=2048
packets_and_frames.frame.13.pkt_duration_time="0.040000"
-packets_and_frames.frame.13.pkt_pos="1024646"
+packets_and_frames.frame.13.pkt_pos="1024731"
packets_and_frames.frame.13.width=100
packets_and_frames.frame.13.height=100
packets_and_frames.frame.13.pix_fmt="rgb24"
@@ -435,8 +435,8 @@ streams.stream.0.avg_frame_rate="0/0"
streams.stream.0.time_base="1/44100"
streams.stream.0.start_pts=0
streams.stream.0.start_time="0.000000"
-streams.stream.0.duration_ts=527364
-streams.stream.0.duration="11.958367"
+streams.stream.0.duration_ts=527406
+streams.stream.0.duration="11.959320"
streams.stream.0.bit_rate="705600"
streams.stream.0.nb_frames="N/A"
streams.stream.0.nb_read_frames="6"
@@ -452,6 +452,7 @@ streams.stream.0.disposition.hearing_impaired=0
streams.stream.0.disposition.visual_impaired=0
streams.stream.0.disposition.clean_effects=0
streams.stream.0.disposition.attached_pic=0
+streams.stream.0.tags.E="mc²"
streams.stream.1.index=1
streams.stream.1.codec_name="rawvideo"
streams.stream.1.profile="unknown"
@@ -473,8 +474,8 @@ streams.stream.1.avg_frame_rate="25/1"
streams.stream.1.time_base="1/51200"
streams.stream.1.start_pts=0
streams.stream.1.start_time="0.000000"
-streams.stream.1.duration_ts=612268
-streams.stream.1.duration="11.958359"
+streams.stream.1.duration_ts=612317
+streams.stream.1.duration="11.959316"
streams.stream.1.bit_rate="N/A"
streams.stream.1.nb_frames="N/A"
streams.stream.1.nb_read_frames="4"
@@ -490,6 +491,8 @@ streams.stream.1.disposition.hearing_impaired=0
streams.stream.1.disposition.visual_impaired=0
streams.stream.1.disposition.clean_effects=0
streams.stream.1.disposition.attached_pic=0
+streams.stream.1.tags.title="foobar"
+streams.stream.1.tags.duration_ts="field-and-tags-conflict-attempt"
streams.stream.2.index=2
streams.stream.2.codec_name="rawvideo"
streams.stream.2.profile="unknown"
@@ -511,8 +514,8 @@ streams.stream.2.avg_frame_rate="25/1"
streams.stream.2.time_base="1/51200"
streams.stream.2.start_pts=0
streams.stream.2.start_time="0.000000"
-streams.stream.2.duration_ts=612268
-streams.stream.2.duration="11.958359"
+streams.stream.2.duration_ts=612317
+streams.stream.2.duration="11.959316"
streams.stream.2.bit_rate="N/A"
streams.stream.2.nb_frames="N/A"
streams.stream.2.nb_read_frames="4"
@@ -532,8 +535,8 @@ format.filename="tests/data/ffprobe-test.nut"
format.nb_streams=3
format.format_name="nut"
format.start_time="0.000000"
-format.duration="11.958367"
-format.size="1054727"
+format.duration="11.959320"
+format.size="1054812"
format.bit_rate="705599"
format.tags.title="ffprobe test file"
format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">"
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index fd01c7c..af38129 100644
--- a/tests/ref/fate/ffprobe_ini
+++ b/tests/ref/fate/ffprobe_ini
@@ -12,7 +12,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=487
+pos=572
flags=K
[packets_and_frames.frame.0]
@@ -24,7 +24,7 @@ pkt_dts=0
pkt_dts_time=0.000000
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=487
+pkt_pos=572
sample_fmt=s16
nb_samples=1024
channels=1
@@ -42,7 +42,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=2562
+pos=2647
flags=K
[packets_and_frames.frame.1]
@@ -54,7 +54,7 @@ pkt_dts=0
pkt_dts_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=2562
+pkt_pos=2647
width=320
height=240
pix_fmt=rgb24
@@ -79,7 +79,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=232983
+pos=233068
flags=K
[packets_and_frames.frame.2]
@@ -91,7 +91,7 @@ pkt_dts=0
pkt_dts_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=232983
+pkt_pos=233068
width=100
height=100
pix_fmt=rgb24
@@ -116,7 +116,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=262988
+pos=263073
flags=K
[packets_and_frames.frame.3]
@@ -128,7 +128,7 @@ pkt_dts=1024
pkt_dts_time=0.023220
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=262988
+pkt_pos=263073
sample_fmt=s16
nb_samples=1024
channels=1
@@ -146,7 +146,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=265066
+pos=265151
flags=K
[packets_and_frames.frame.4]
@@ -158,7 +158,7 @@ pkt_dts=2048
pkt_dts_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=265066
+pkt_pos=265151
width=320
height=240
pix_fmt=rgb24
@@ -183,7 +183,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=495490
+pos=495575
flags=K
[packets_and_frames.frame.5]
@@ -195,7 +195,7 @@ pkt_dts=2048
pkt_dts_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=495490
+pkt_pos=495575
width=100
height=100
pix_fmt=rgb24
@@ -220,7 +220,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=525495
+pos=525580
flags=K
[packets_and_frames.frame.6]
@@ -232,7 +232,7 @@ pkt_dts=2048
pkt_dts_time=0.046440
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=525495
+pkt_pos=525580
sample_fmt=s16
nb_samples=1024
channels=1
@@ -250,7 +250,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=527566
+pos=527651
flags=K
[packets_and_frames.frame.7]
@@ -262,7 +262,7 @@ pkt_dts=3072
pkt_dts_time=0.069660
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=527566
+pkt_pos=527651
sample_fmt=s16
nb_samples=1024
channels=1
@@ -280,7 +280,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=529644
+pos=529729
flags=K
[packets_and_frames.frame.8]
@@ -292,7 +292,7 @@ pkt_dts=4096
pkt_dts_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=529644
+pkt_pos=529729
width=320
height=240
pix_fmt=rgb24
@@ -317,7 +317,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=760068
+pos=760153
flags=K
[packets_and_frames.frame.9]
@@ -329,7 +329,7 @@ pkt_dts=4096
pkt_dts_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=760068
+pkt_pos=760153
width=100
height=100
pix_fmt=rgb24
@@ -354,7 +354,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=790073
+pos=790158
flags=K
[packets_and_frames.frame.10]
@@ -366,7 +366,7 @@ pkt_dts=4096
pkt_dts_time=0.092880
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=790073
+pkt_pos=790158
sample_fmt=s16
nb_samples=1024
channels=1
@@ -384,7 +384,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
-pos=792144
+pos=792229
flags=K
[packets_and_frames.frame.11]
@@ -396,7 +396,7 @@ pkt_dts=5120
pkt_dts_time=0.116100
pkt_duration=1024
pkt_duration_time=0.023220
-pkt_pos=792144
+pkt_pos=792229
sample_fmt=s16
nb_samples=1024
channels=1
@@ -414,7 +414,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
-pos=794222
+pos=794307
flags=K
[packets_and_frames.frame.12]
@@ -426,7 +426,7 @@ pkt_dts=6144
pkt_dts_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=794222
+pkt_pos=794307
width=320
height=240
pix_fmt=rgb24
@@ -451,7 +451,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
-pos=1024646
+pos=1024731
flags=K
[packets_and_frames.frame.13]
@@ -463,7 +463,7 @@ pkt_dts=6144
pkt_dts_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
-pkt_pos=1024646
+pkt_pos=1024731
width=100
height=100
pix_fmt=rgb24
@@ -494,8 +494,8 @@ avg_frame_rate=0/0
time_base=1/44100
start_pts=0
start_time=0.000000
-duration_ts=527364
-duration=11.958367
+duration_ts=527406
+duration=11.959320
bit_rate=705600
nb_frames=N/A
nb_read_frames=6
@@ -514,6 +514,9 @@ visual_impaired=0
clean_effects=0
attached_pic=0
+[streams.stream.0.tags]
+E=mc²
+
[streams.stream.1]
index=1
codec_name=rawvideo
@@ -536,8 +539,8 @@ avg_frame_rate=25/1
time_base=1/51200
start_pts=0
start_time=0.000000
-duration_ts=612268
-duration=11.958359
+duration_ts=612317
+duration=11.959316
bit_rate=N/A
nb_frames=N/A
nb_read_frames=4
@@ -556,6 +559,10 @@ visual_impaired=0
clean_effects=0
attached_pic=0
+[streams.stream.1.tags]
+title=foobar
+duration_ts=field-and-tags-conflict-attempt
+
[streams.stream.2]
index=2
codec_name=rawvideo
@@ -578,8 +585,8 @@ avg_frame_rate=25/1
time_base=1/51200
start_pts=0
start_time=0.000000
-duration_ts=612268
-duration=11.958359
+duration_ts=612317
+duration=11.959316
bit_rate=N/A
nb_frames=N/A
nb_read_frames=4
@@ -603,8 +610,8 @@ filename=tests/data/ffprobe-test.nut
nb_streams=3
format_name=nut
start_time=0.000000
-duration=11.958367
-size=1054727
+duration=11.959320
+size=1054812
bit_rate=705599
[format.tags]
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
index 286e8ee..37e2e51 100644
--- a/tests/ref/fate/ffprobe_json
+++ b/tests/ref/fate/ffprobe_json
@@ -11,7 +11,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "487",
+ "pos": "572",
"flags": "K"
},
{
@@ -24,7 +24,7 @@
"pkt_dts_time": "0.000000",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "487",
+ "pkt_pos": "572",
"sample_fmt": "s16",
"nb_samples": 1024,
"channels": 1
@@ -40,7 +40,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "2562",
+ "pos": "2647",
"flags": "K"
},
{
@@ -53,7 +53,7 @@
"pkt_dts_time": "0.000000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "2562",
+ "pkt_pos": "2647",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
@@ -77,7 +77,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "232983",
+ "pos": "233068",
"flags": "K"
},
{
@@ -90,7 +90,7 @@
"pkt_dts_time": "0.000000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "232983",
+ "pkt_pos": "233068",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
@@ -114,7 +114,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "262988",
+ "pos": "263073",
"flags": "K"
},
{
@@ -127,7 +127,7 @@
"pkt_dts_time": "0.023220",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "262988",
+ "pkt_pos": "263073",
"sample_fmt": "s16",
"nb_samples": 1024,
"channels": 1
@@ -143,7 +143,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "265066",
+ "pos": "265151",
"flags": "K"
},
{
@@ -156,7 +156,7 @@
"pkt_dts_time": "0.040000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "265066",
+ "pkt_pos": "265151",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
@@ -180,7 +180,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "495490",
+ "pos": "495575",
"flags": "K"
},
{
@@ -193,7 +193,7 @@
"pkt_dts_time": "0.040000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "495490",
+ "pkt_pos": "495575",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
@@ -217,7 +217,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "525495",
+ "pos": "525580",
"flags": "K"
},
{
@@ -230,7 +230,7 @@
"pkt_dts_time": "0.046440",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "525495",
+ "pkt_pos": "525580",
"sample_fmt": "s16",
"nb_samples": 1024,
"channels": 1
@@ -246,7 +246,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "527566",
+ "pos": "527651",
"flags": "K"
},
{
@@ -259,7 +259,7 @@
"pkt_dts_time": "0.069660",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "527566",
+ "pkt_pos": "527651",
"sample_fmt": "s16",
"nb_samples": 1024,
"channels": 1
@@ -275,7 +275,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "529644",
+ "pos": "529729",
"flags": "K"
},
{
@@ -288,7 +288,7 @@
"pkt_dts_time": "0.080000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "529644",
+ "pkt_pos": "529729",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
@@ -312,7 +312,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "760068",
+ "pos": "760153",
"flags": "K"
},
{
@@ -325,7 +325,7 @@
"pkt_dts_time": "0.080000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "760068",
+ "pkt_pos": "760153",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
@@ -349,7 +349,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "790073",
+ "pos": "790158",
"flags": "K"
},
{
@@ -362,7 +362,7 @@
"pkt_dts_time": "0.092880",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "790073",
+ "pkt_pos": "790158",
"sample_fmt": "s16",
"nb_samples": 1024,
"channels": 1
@@ -378,7 +378,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
- "pos": "792144",
+ "pos": "792229",
"flags": "K"
},
{
@@ -391,7 +391,7 @@
"pkt_dts_time": "0.116100",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
- "pkt_pos": "792144",
+ "pkt_pos": "792229",
"sample_fmt": "s16",
"nb_samples": 1024,
"channels": 1
@@ -407,7 +407,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
- "pos": "794222",
+ "pos": "794307",
"flags": "K"
},
{
@@ -420,7 +420,7 @@
"pkt_dts_time": "0.120000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "794222",
+ "pkt_pos": "794307",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
@@ -444,7 +444,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
- "pos": "1024646",
+ "pos": "1024731",
"flags": "K"
},
{
@@ -457,7 +457,7 @@
"pkt_dts_time": "0.120000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
- "pkt_pos": "1024646",
+ "pkt_pos": "1024731",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
@@ -488,8 +488,8 @@
"time_base": "1/44100",
"start_pts": 0,
"start_time": "0.000000",
- "duration_ts": 527364,
- "duration": "11.958367",
+ "duration_ts": 527406,
+ "duration": "11.959320",
"bit_rate": "705600",
"nb_read_frames": "6",
"nb_read_packets": "6",
@@ -505,6 +505,9 @@
"visual_impaired": 0,
"clean_effects": 0,
"attached_pic": 0
+ },
+ "tags": {
+ "E": "mc²"
}
},
{
@@ -526,8 +529,8 @@
"time_base": "1/51200",
"start_pts": 0,
"start_time": "0.000000",
- "duration_ts": 612268,
- "duration": "11.958359",
+ "duration_ts": 612317,
+ "duration": "11.959316",
"nb_read_frames": "4",
"nb_read_packets": "4",
"disposition": {
@@ -542,6 +545,10 @@
"visual_impaired": 0,
"clean_effects": 0,
"attached_pic": 0
+ },
+ "tags": {
+ "title": "foobar",
+ "duration_ts": "field-and-tags-conflict-attempt"
}
},
{
@@ -563,8 +570,8 @@
"time_base": "1/51200",
"start_pts": 0,
"start_time": "0.000000",
- "duration_ts": 612268,
- "duration": "11.958359",
+ "duration_ts": 612317,
+ "duration": "11.959316",
"nb_read_frames": "4",
"nb_read_packets": "4",
"disposition": {
@@ -587,8 +594,8 @@
"nb_streams": 3,
"format_name": "nut",
"start_time": "0.000000",
- "duration": "11.958367",
- "size": "1054727",
+ "duration": "11.959320",
+ "size": "1054812",
"bit_rate": "705599",
"tags": {
"title": "ffprobe test file",
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
index e7e61a5..f428f9d 100644
--- a/tests/ref/fate/ffprobe_xml
+++ b/tests/ref/fate/ffprobe_xml
@@ -1,49 +1,52 @@
<?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="487" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="487" 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="2562" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2562" 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" reference="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="232983" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="232983" 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" reference="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="262988" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="262988" 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="265066" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265066" 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" reference="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="495490" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495490" 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" reference="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="525495" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525495" 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="527566" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527566" 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="529644" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529644" 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" reference="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="760068" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760068" 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" reference="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="790073" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790073" 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="792144" flags="K"/>
- <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792144" 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="794222" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794222" 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" reference="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="1024646" flags="K"/>
- <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024646" 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" reference="0"/>
+ <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="572" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="572" 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="2647" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2647" 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" reference="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="233068" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233068" 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" reference="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="263073" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263073" 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="265151" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265151" 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" reference="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="495575" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495575" 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" reference="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="525580" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525580" 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="527651" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527651" 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="529729" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529729" 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" reference="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="760153" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760153" 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" reference="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="790158" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790158" 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="792229" flags="K"/>
+ <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792229" 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="794307" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794307" 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" reference="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="1024731" flags="K"/>
+ <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024731" 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" reference="0"/>
</packets_and_frames>
<streams>
- <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="[1][0][0][0]" codec_tag="0x0001" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" duration_ts="527364" duration="11.958367" bit_rate="705600" nb_read_frames="6" nb_read_packets="6">
+ <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="[1][0][0][0]" codec_tag="0x0001" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" duration_ts="527406" duration="11.959320" bit_rate="705600" nb_read_frames="6" nb_read_packets="6">
<disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>
+ <tag key="E" value="mc²"/>
</stream>
- <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612268" duration="11.958359" nb_read_frames="4" nb_read_packets="4">
+ <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612317" duration="11.959316" nb_read_frames="4" nb_read_packets="4">
<disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>
+ <tag key="title" value="foobar"/>
+ <tag key="duration_ts" value="field-and-tags-conflict-attempt"/>
</stream>
- <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612268" duration="11.958359" nb_read_frames="4" nb_read_packets="4">
+ <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612317" duration="11.959316" nb_read_frames="4" nb_read_packets="4">
<disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>
</stream>
</streams>
- <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" start_time="0.000000" duration="11.958367" size="1054727" bit_rate="705599">
+ <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" start_time="0.000000" duration="11.959320" size="1054812" bit_rate="705599">
<tag key="title" value="ffprobe test file"/>
<tag key="comment" value="'A comment with CSV, XML & JSON special chars': <tag value="x">"/>
<tag key="comment2" value="I ♥ Üñîçød€"/>
diff --git a/tests/test.ffmeta b/tests/test.ffmeta
index 8c19e5e..ad37b02 100644
--- a/tests/test.ffmeta
+++ b/tests/test.ffmeta
@@ -2,3 +2,8 @@
title=ffprobe test file
comment='A comment with CSV, XML & JSON special chars': <tag value=\"x\">
comment2=I ♥ Üñîçød€
+[STREAM]
+E=mc²
+[STREAM]
+title=foobar
+duration_ts=field-and-tags-conflict-attempt
More information about the ffmpeg-cvslog
mailing list