1. ffmpeg
  2. Commit 09ec31ce3aab41407965e7a95b7d145702434c26
Browse code

ffprobe: print stream_index with frame data

This makes it easier to relate frame data to its associated stream.

Dave Rice authored on 2015/05/26 09:46:12
Showing 9 changed files
doc/ffprobe.xsd
History View file @ 09ec31c
... ... 
@@ -87,6 +87,7 @@
87 87 
       </xsd:sequence>
88 88
89 89 
       <xsd:attribute name="media_type"    type="xsd:string" use="required"/>
90 
+      <xsd:attribute name="stream_index"  type="xsd:int"  />
90 91 
       <xsd:attribute name="key_frame"     type="xsd:int"    use="required"/>
91 92 
       <xsd:attribute name="pts"           type="xsd:long" />
92 93 
       <xsd:attribute name="pts_time"      type="xsd:float"/>
ffprobe.c
History View file @ 09ec31c
... ... 
@@ -1824,6 +1824,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
1824 1824 
     s = av_get_media_type_string(stream->codec->codec_type);
1825 1825 
     if (s) print_str    ("media_type", s);
1826 1826 
     else   print_str_opt("media_type", "unknown");
1827 
+    print_int("stream_index",           stream->index);
1827 1828 
     print_int("key_frame",              frame->key_frame);
1828 1829 
     print_ts  ("pkt_pts",               frame->pkt_pts);
1829 1830 
     print_time("pkt_pts_time",          frame->pkt_pts, &stream->time_base);
tests/ref/fate/ffprobe_compact
History View file @ 09ec31c
... ... 
@@ -1,31 +1,31 @@
1 1 
 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=642|flags=K
2 
-frame|media_type=audio|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=642|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
2 
+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=642|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
3 3 
 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=2717|flags=K
4 
-frame|media_type=video|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=2717|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
4 
+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=2717|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
5 5 
 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=233138|flags=K
6 
-frame|media_type=video|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=233138|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
6 
+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=233138|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
7 7 
 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=263143|flags=K
8 
-frame|media_type=audio|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=263143|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
8 
+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=263143|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
9 9 
 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=265221|flags=K
10 
-frame|media_type=video|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=265221|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
10 
+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=265221|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
11 11 
 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=495645|flags=K
12 
-frame|media_type=video|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=495645|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
12 
+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=495645|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
13 13 
 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=525650|flags=K
14 
-frame|media_type=audio|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=525650|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
14 
+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=525650|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
15 15 
 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=527721|flags=K
16 
-frame|media_type=audio|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=527721|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
16 
+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=527721|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
17 17 
 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=529799|flags=K
18 
-frame|media_type=video|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=529799|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
18 
+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=529799|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
19 19 
 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=760223|flags=K
20 
-frame|media_type=video|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=760223|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
20 
+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=760223|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
21 21 
 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=790228|flags=K
22 
-frame|media_type=audio|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=790228|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
22 
+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=790228|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
23 23 
 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=792299|flags=K
24 
-frame|media_type=audio|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=792299|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
24 
+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=792299|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
25 25 
 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=794377|flags=K
26 
-frame|media_type=video|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=794377|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
26 
+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=794377|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
27 27 
 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=1024801|flags=K
28 
-frame|media_type=video|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=1024801|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
28 
+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=1024801|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
29 29 
 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
30 30 
 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|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
31 31 
 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|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|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:encoder=Lavc rawvideo
tests/ref/fate/ffprobe_csv
History View file @ 09ec31c
... ... 
@@ -1,31 +1,31 @@
1 1 
 packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,642,K
2 
-frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown
2 
+frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown
3 3 
 packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2717,K
4 
-frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2717,230400,320,240,rgb24,1:1,I,0,0,0,0,0
4 
+frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2717,230400,320,240,rgb24,1:1,I,0,0,0,0,0
5 5 
 packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233138,K
6 
-frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233138,30000,100,100,rgb24,1:1,I,0,0,0,0,0
6 
+frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233138,30000,100,100,rgb24,1:1,I,0,0,0,0,0
7 7 
 packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263143,K
8 
-frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown
8 
+frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown
9 9 
 packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265221,K
10 
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265221,230400,320,240,rgb24,1:1,I,0,0,0,0,0
10 
+frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265221,230400,320,240,rgb24,1:1,I,0,0,0,0,0
11 11 
 packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495645,K
12 
-frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495645,30000,100,100,rgb24,1:1,I,0,0,0,0,0
12 
+frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495645,30000,100,100,rgb24,1:1,I,0,0,0,0,0
13 13 
 packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525650,K
14 
-frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown
14 
+frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown
15 15 
 packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527721,K
16 
-frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown
16 
+frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown
17 17 
 packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529799,K
18 
-frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529799,230400,320,240,rgb24,1:1,I,0,0,0,0,0
18 
+frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529799,230400,320,240,rgb24,1:1,I,0,0,0,0,0
19 19 
 packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760223,K
20 
-frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760223,30000,100,100,rgb24,1:1,I,0,0,0,0,0
20 
+frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760223,30000,100,100,rgb24,1:1,I,0,0,0,0,0
21 21 
 packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790228,K
22 
-frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown
22 
+frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown
23 23 
 packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792299,K
24 
-frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown
24 
+frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown
25 25 
 packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794377,K
26 
-frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794377,230400,320,240,rgb24,1:1,I,0,0,0,0,0
26 
+frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794377,230400,320,240,rgb24,1:1,I,0,0,0,0,0
27 27 
 packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024801,K
28 
-frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024801,30000,100,100,rgb24,1:1,I,0,0,0,0,0
28 
+frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024801,30000,100,100,rgb24,1:1,I,0,0,0,0,0
29 29 
 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
30 30 
 stream,1,rawvideo,unknown,video,1/51200,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
31 31 
 stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,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,Lavc rawvideo
tests/ref/fate/ffprobe_default
History View file @ 09ec31c
... ... 
@@ -15,6 +15,7 @@ flags=K
15 15 
 [/PACKET]
16 16 
 [FRAME]
17 17 
 media_type=audio
18 
+stream_index=0
18 19 
 key_frame=1
19 20 
 pkt_pts=0
20 21 
 pkt_pts_time=0.000000
... ... 
@@ -48,6 +49,7 @@ flags=K
48 48 
 [/PACKET]
49 49 
 [FRAME]
50 50 
 media_type=video
51 
+stream_index=1
51 52 
 key_frame=1
52 53 
 pkt_pts=0
53 54 
 pkt_pts_time=0.000000
... ... 
@@ -87,6 +89,7 @@ flags=K
87 87 
 [/PACKET]
88 88 
 [FRAME]
89 89 
 media_type=video
90 
+stream_index=2
90 91 
 key_frame=1
91 92 
 pkt_pts=0
92 93 
 pkt_pts_time=0.000000
... ... 
@@ -126,6 +129,7 @@ flags=K
126 126 
 [/PACKET]
127 127 
 [FRAME]
128 128 
 media_type=audio
129 
+stream_index=0
129 130 
 key_frame=1
130 131 
 pkt_pts=1024
131 132 
 pkt_pts_time=0.023220
... ... 
@@ -159,6 +163,7 @@ flags=K
159 159 
 [/PACKET]
160 160 
 [FRAME]
161 161 
 media_type=video
162 
+stream_index=1
162 163 
 key_frame=1
163 164 
 pkt_pts=2048
164 165 
 pkt_pts_time=0.040000
... ... 
@@ -198,6 +203,7 @@ flags=K
198 198 
 [/PACKET]
199 199 
 [FRAME]
200 200 
 media_type=video
201 
+stream_index=2
201 202 
 key_frame=1
202 203 
 pkt_pts=2048
203 204 
 pkt_pts_time=0.040000
... ... 
@@ -237,6 +243,7 @@ flags=K
237 237 
 [/PACKET]
238 238 
 [FRAME]
239 239 
 media_type=audio
240 
+stream_index=0
240 241 
 key_frame=1
241 242 
 pkt_pts=2048
242 243 
 pkt_pts_time=0.046440
... ... 
@@ -270,6 +277,7 @@ flags=K
270 270 
 [/PACKET]
271 271 
 [FRAME]
272 272 
 media_type=audio
273 
+stream_index=0
273 274 
 key_frame=1
274 275 
 pkt_pts=3072
275 276 
 pkt_pts_time=0.069660
... ... 
@@ -303,6 +311,7 @@ flags=K
303 303 
 [/PACKET]
304 304 
 [FRAME]
305 305 
 media_type=video
306 
+stream_index=1
306 307 
 key_frame=1
307 308 
 pkt_pts=4096
308 309 
 pkt_pts_time=0.080000
... ... 
@@ -342,6 +351,7 @@ flags=K
342 342 
 [/PACKET]
343 343 
 [FRAME]
344 344 
 media_type=video
345 
+stream_index=2
345 346 
 key_frame=1
346 347 
 pkt_pts=4096
347 348 
 pkt_pts_time=0.080000
... ... 
@@ -381,6 +391,7 @@ flags=K
381 381 
 [/PACKET]
382 382 
 [FRAME]
383 383 
 media_type=audio
384 
+stream_index=0
384 385 
 key_frame=1
385 386 
 pkt_pts=4096
386 387 
 pkt_pts_time=0.092880
... ... 
@@ -414,6 +425,7 @@ flags=K
414 414 
 [/PACKET]
415 415 
 [FRAME]
416 416 
 media_type=audio
417 
+stream_index=0
417 418 
 key_frame=1
418 419 
 pkt_pts=5120
419 420 
 pkt_pts_time=0.116100
... ... 
@@ -447,6 +459,7 @@ flags=K
447 447 
 [/PACKET]
448 448 
 [FRAME]
449 449 
 media_type=video
450 
+stream_index=1
450 451 
 key_frame=1
451 452 
 pkt_pts=6144
452 453 
 pkt_pts_time=0.120000
... ... 
@@ -486,6 +499,7 @@ flags=K
486 486 
 [/PACKET]
487 487 
 [FRAME]
488 488 
 media_type=video
489 
+stream_index=2
489 490 
 key_frame=1
490 491 
 pkt_pts=6144
491 492 
 pkt_pts_time=0.120000
tests/ref/fate/ffprobe_flat
History View file @ 09ec31c
... ... 
@@ -12,6 +12,7 @@ packets_and_frames.packet.0.size="2048"
12 12 
 packets_and_frames.packet.0.pos="642"
13 13 
 packets_and_frames.packet.0.flags="K"
14 14 
 packets_and_frames.frame.0.media_type="audio"
15 
+packets_and_frames.frame.0.stream_index=0
15 16 
 packets_and_frames.frame.0.key_frame=1
16 17 
 packets_and_frames.frame.0.pkt_pts=0
17 18 
 packets_and_frames.frame.0.pkt_pts_time="0.000000"
... ... 
@@ -41,6 +42,7 @@ packets_and_frames.packet.1.size="230400"
41 41 
 packets_and_frames.packet.1.pos="2717"
42 42 
 packets_and_frames.packet.1.flags="K"
43 43 
 packets_and_frames.frame.1.media_type="video"
44 
+packets_and_frames.frame.1.stream_index=1
44 45 
 packets_and_frames.frame.1.key_frame=1
45 46 
 packets_and_frames.frame.1.pkt_pts=0
46 47 
 packets_and_frames.frame.1.pkt_pts_time="0.000000"
... ... 
@@ -76,6 +78,7 @@ packets_and_frames.packet.2.size="30000"
76 76 
 packets_and_frames.packet.2.pos="233138"
77 77 
 packets_and_frames.packet.2.flags="K"
78 78 
 packets_and_frames.frame.2.media_type="video"
79 
+packets_and_frames.frame.2.stream_index=2
79 80 
 packets_and_frames.frame.2.key_frame=1
80 81 
 packets_and_frames.frame.2.pkt_pts=0
81 82 
 packets_and_frames.frame.2.pkt_pts_time="0.000000"
... ... 
@@ -111,6 +114,7 @@ packets_and_frames.packet.3.size="2048"
111 111 
 packets_and_frames.packet.3.pos="263143"
112 112 
 packets_and_frames.packet.3.flags="K"
113 113 
 packets_and_frames.frame.3.media_type="audio"
114 
+packets_and_frames.frame.3.stream_index=0
114 115 
 packets_and_frames.frame.3.key_frame=1
115 116 
 packets_and_frames.frame.3.pkt_pts=1024
116 117 
 packets_and_frames.frame.3.pkt_pts_time="0.023220"
... ... 
@@ -140,6 +144,7 @@ packets_and_frames.packet.4.size="230400"
140 140 
 packets_and_frames.packet.4.pos="265221"
141 141 
 packets_and_frames.packet.4.flags="K"
142 142 
 packets_and_frames.frame.4.media_type="video"
143 
+packets_and_frames.frame.4.stream_index=1
143 144 
 packets_and_frames.frame.4.key_frame=1
144 145 
 packets_and_frames.frame.4.pkt_pts=2048
145 146 
 packets_and_frames.frame.4.pkt_pts_time="0.040000"
... ... 
@@ -175,6 +180,7 @@ packets_and_frames.packet.5.size="30000"
175 175 
 packets_and_frames.packet.5.pos="495645"
176 176 
 packets_and_frames.packet.5.flags="K"
177 177 
 packets_and_frames.frame.5.media_type="video"
178 
+packets_and_frames.frame.5.stream_index=2
178 179 
 packets_and_frames.frame.5.key_frame=1
179 180 
 packets_and_frames.frame.5.pkt_pts=2048
180 181 
 packets_and_frames.frame.5.pkt_pts_time="0.040000"
... ... 
@@ -210,6 +216,7 @@ packets_and_frames.packet.6.size="2048"
210 210 
 packets_and_frames.packet.6.pos="525650"
211 211 
 packets_and_frames.packet.6.flags="K"
212 212 
 packets_and_frames.frame.6.media_type="audio"
213 
+packets_and_frames.frame.6.stream_index=0
213 214 
 packets_and_frames.frame.6.key_frame=1
214 215 
 packets_and_frames.frame.6.pkt_pts=2048
215 216 
 packets_and_frames.frame.6.pkt_pts_time="0.046440"
... ... 
@@ -239,6 +246,7 @@ packets_and_frames.packet.7.size="2048"
239 239 
 packets_and_frames.packet.7.pos="527721"
240 240 
 packets_and_frames.packet.7.flags="K"
241 241 
 packets_and_frames.frame.7.media_type="audio"
242 
+packets_and_frames.frame.7.stream_index=0
242 243 
 packets_and_frames.frame.7.key_frame=1
243 244 
 packets_and_frames.frame.7.pkt_pts=3072
244 245 
 packets_and_frames.frame.7.pkt_pts_time="0.069660"
... ... 
@@ -268,6 +276,7 @@ packets_and_frames.packet.8.size="230400"
268 268 
 packets_and_frames.packet.8.pos="529799"
269 269 
 packets_and_frames.packet.8.flags="K"
270 270 
 packets_and_frames.frame.8.media_type="video"
271 
+packets_and_frames.frame.8.stream_index=1
271 272 
 packets_and_frames.frame.8.key_frame=1
272 273 
 packets_and_frames.frame.8.pkt_pts=4096
273 274 
 packets_and_frames.frame.8.pkt_pts_time="0.080000"
... ... 
@@ -303,6 +312,7 @@ packets_and_frames.packet.9.size="30000"
303 303 
 packets_and_frames.packet.9.pos="760223"
304 304 
 packets_and_frames.packet.9.flags="K"
305 305 
 packets_and_frames.frame.9.media_type="video"
306 
+packets_and_frames.frame.9.stream_index=2
306 307 
 packets_and_frames.frame.9.key_frame=1
307 308 
 packets_and_frames.frame.9.pkt_pts=4096
308 309 
 packets_and_frames.frame.9.pkt_pts_time="0.080000"
... ... 
@@ -338,6 +348,7 @@ packets_and_frames.packet.10.size="2048"
338 338 
 packets_and_frames.packet.10.pos="790228"
339 339 
 packets_and_frames.packet.10.flags="K"
340 340 
 packets_and_frames.frame.10.media_type="audio"
341 
+packets_and_frames.frame.10.stream_index=0
341 342 
 packets_and_frames.frame.10.key_frame=1
342 343 
 packets_and_frames.frame.10.pkt_pts=4096
343 344 
 packets_and_frames.frame.10.pkt_pts_time="0.092880"
... ... 
@@ -367,6 +378,7 @@ packets_and_frames.packet.11.size="2048"
367 367 
 packets_and_frames.packet.11.pos="792299"
368 368 
 packets_and_frames.packet.11.flags="K"
369 369 
 packets_and_frames.frame.11.media_type="audio"
370 
+packets_and_frames.frame.11.stream_index=0
370 371 
 packets_and_frames.frame.11.key_frame=1
371 372 
 packets_and_frames.frame.11.pkt_pts=5120
372 373 
 packets_and_frames.frame.11.pkt_pts_time="0.116100"
... ... 
@@ -396,6 +408,7 @@ packets_and_frames.packet.12.size="230400"
396 396 
 packets_and_frames.packet.12.pos="794377"
397 397 
 packets_and_frames.packet.12.flags="K"
398 398 
 packets_and_frames.frame.12.media_type="video"
399 
+packets_and_frames.frame.12.stream_index=1
399 400 
 packets_and_frames.frame.12.key_frame=1
400 401 
 packets_and_frames.frame.12.pkt_pts=6144
401 402 
 packets_and_frames.frame.12.pkt_pts_time="0.120000"
... ... 
@@ -431,6 +444,7 @@ packets_and_frames.packet.13.size="30000"
431 431 
 packets_and_frames.packet.13.pos="1024801"
432 432 
 packets_and_frames.packet.13.flags="K"
433 433 
 packets_and_frames.frame.13.media_type="video"
434 
+packets_and_frames.frame.13.stream_index=2
434 435 
 packets_and_frames.frame.13.key_frame=1
435 436 
 packets_and_frames.frame.13.pkt_pts=6144
436 437 
 packets_and_frames.frame.13.pkt_pts_time="0.120000"
tests/ref/fate/ffprobe_ini
History View file @ 09ec31c
... ... 
@@ -17,6 +17,7 @@ flags=K
17 17
18 18 
 [packets_and_frames.frame.0]
19 19 
 media_type=audio
20 
+stream_index=0
20 21 
 key_frame=1
21 22 
 pkt_pts=0
22 23 
 pkt_pts_time=0.000000
... ... 
@@ -50,6 +51,7 @@ flags=K
50 50
51 51 
 [packets_and_frames.frame.1]
52 52 
 media_type=video
53 
+stream_index=1
53 54 
 key_frame=1
54 55 
 pkt_pts=0
55 56 
 pkt_pts_time=0.000000
... ... 
@@ -89,6 +91,7 @@ flags=K
89 89
90 90 
 [packets_and_frames.frame.2]
91 91 
 media_type=video
92 
+stream_index=2
92 93 
 key_frame=1
93 94 
 pkt_pts=0
94 95 
 pkt_pts_time=0.000000
... ... 
@@ -128,6 +131,7 @@ flags=K
128 128
129 129 
 [packets_and_frames.frame.3]
130 130 
 media_type=audio
131 
+stream_index=0
131 132 
 key_frame=1
132 133 
 pkt_pts=1024
133 134 
 pkt_pts_time=0.023220
... ... 
@@ -161,6 +165,7 @@ flags=K
161 161
162 162 
 [packets_and_frames.frame.4]
163 163 
 media_type=video
164 
+stream_index=1
164 165 
 key_frame=1
165 166 
 pkt_pts=2048
166 167 
 pkt_pts_time=0.040000
... ... 
@@ -200,6 +205,7 @@ flags=K
200 200
201 201 
 [packets_and_frames.frame.5]
202 202 
 media_type=video
203 
+stream_index=2
203 204 
 key_frame=1
204 205 
 pkt_pts=2048
205 206 
 pkt_pts_time=0.040000
... ... 
@@ -239,6 +245,7 @@ flags=K
239 239
240 240 
 [packets_and_frames.frame.6]
241 241 
 media_type=audio
242 
+stream_index=0
242 243 
 key_frame=1
243 244 
 pkt_pts=2048
244 245 
 pkt_pts_time=0.046440
... ... 
@@ -272,6 +279,7 @@ flags=K
272 272
273 273 
 [packets_and_frames.frame.7]
274 274 
 media_type=audio
275 
+stream_index=0
275 276 
 key_frame=1
276 277 
 pkt_pts=3072
277 278 
 pkt_pts_time=0.069660
... ... 
@@ -305,6 +313,7 @@ flags=K
305 305
306 306 
 [packets_and_frames.frame.8]
307 307 
 media_type=video
308 
+stream_index=1
308 309 
 key_frame=1
309 310 
 pkt_pts=4096
310 311 
 pkt_pts_time=0.080000
... ... 
@@ -344,6 +353,7 @@ flags=K
344 344
345 345 
 [packets_and_frames.frame.9]
346 346 
 media_type=video
347 
+stream_index=2
347 348 
 key_frame=1
348 349 
 pkt_pts=4096
349 350 
 pkt_pts_time=0.080000
... ... 
@@ -383,6 +393,7 @@ flags=K
383 383
384 384 
 [packets_and_frames.frame.10]
385 385 
 media_type=audio
386 
+stream_index=0
386 387 
 key_frame=1
387 388 
 pkt_pts=4096
388 389 
 pkt_pts_time=0.092880
... ... 
@@ -416,6 +427,7 @@ flags=K
416 416
417 417 
 [packets_and_frames.frame.11]
418 418 
 media_type=audio
419 
+stream_index=0
419 420 
 key_frame=1
420 421 
 pkt_pts=5120
421 422 
 pkt_pts_time=0.116100
... ... 
@@ -449,6 +461,7 @@ flags=K
449 449
450 450 
 [packets_and_frames.frame.12]
451 451 
 media_type=video
452 
+stream_index=1
452 453 
 key_frame=1
453 454 
 pkt_pts=6144
454 455 
 pkt_pts_time=0.120000
... ... 
@@ -488,6 +501,7 @@ flags=K
488 488
489 489 
 [packets_and_frames.frame.13]
490 490 
 media_type=video
491 
+stream_index=2
491 492 
 key_frame=1
492 493 
 pkt_pts=6144
493 494 
 pkt_pts_time=0.120000
tests/ref/fate/ffprobe_json
History View file @ 09ec31c
... ... 
@@ -17,6 +17,7 @@
17 17 
         {
18 18 
             "type": "frame",
19 19 
             "media_type": "audio",
20 
+            "stream_index": 0,
20 21 
             "key_frame": 1,
21 22 
             "pkt_pts": 0,
22 23 
             "pkt_pts_time": "0.000000",
... ... 
@@ -49,6 +50,7 @@
49 49 
         {
50 50 
             "type": "frame",
51 51 
             "media_type": "video",
52 
+            "stream_index": 1,
52 53 
             "key_frame": 1,
53 54 
             "pkt_pts": 0,
54 55 
             "pkt_pts_time": "0.000000",
... ... 
@@ -88,6 +90,7 @@
88 88 
         {
89 89 
             "type": "frame",
90 90 
             "media_type": "video",
91 
+            "stream_index": 2,
91 92 
             "key_frame": 1,
92 93 
             "pkt_pts": 0,
93 94 
             "pkt_pts_time": "0.000000",
... ... 
@@ -127,6 +130,7 @@
127 127 
         {
128 128 
             "type": "frame",
129 129 
             "media_type": "audio",
130 
+            "stream_index": 0,
130 131 
             "key_frame": 1,
131 132 
             "pkt_pts": 1024,
132 133 
             "pkt_pts_time": "0.023220",
... ... 
@@ -159,6 +163,7 @@
159 159 
         {
160 160 
             "type": "frame",
161 161 
             "media_type": "video",
162 
+            "stream_index": 1,
162 163 
             "key_frame": 1,
163 164 
             "pkt_pts": 2048,
164 165 
             "pkt_pts_time": "0.040000",
... ... 
@@ -198,6 +203,7 @@
198 198 
         {
199 199 
             "type": "frame",
200 200 
             "media_type": "video",
201 
+            "stream_index": 2,
201 202 
             "key_frame": 1,
202 203 
             "pkt_pts": 2048,
203 204 
             "pkt_pts_time": "0.040000",
... ... 
@@ -237,6 +243,7 @@
237 237 
         {
238 238 
             "type": "frame",
239 239 
             "media_type": "audio",
240 
+            "stream_index": 0,
240 241 
             "key_frame": 1,
241 242 
             "pkt_pts": 2048,
242 243 
             "pkt_pts_time": "0.046440",
... ... 
@@ -269,6 +276,7 @@
269 269 
         {
270 270 
             "type": "frame",
271 271 
             "media_type": "audio",
272 
+            "stream_index": 0,
272 273 
             "key_frame": 1,
273 274 
             "pkt_pts": 3072,
274 275 
             "pkt_pts_time": "0.069660",
... ... 
@@ -301,6 +309,7 @@
301 301 
         {
302 302 
             "type": "frame",
303 303 
             "media_type": "video",
304 
+            "stream_index": 1,
304 305 
             "key_frame": 1,
305 306 
             "pkt_pts": 4096,
306 307 
             "pkt_pts_time": "0.080000",
... ... 
@@ -340,6 +349,7 @@
340 340 
         {
341 341 
             "type": "frame",
342 342 
             "media_type": "video",
343 
+            "stream_index": 2,
343 344 
             "key_frame": 1,
344 345 
             "pkt_pts": 4096,
345 346 
             "pkt_pts_time": "0.080000",
... ... 
@@ -379,6 +389,7 @@
379 379 
         {
380 380 
             "type": "frame",
381 381 
             "media_type": "audio",
382 
+            "stream_index": 0,
382 383 
             "key_frame": 1,
383 384 
             "pkt_pts": 4096,
384 385 
             "pkt_pts_time": "0.092880",
... ... 
@@ -411,6 +422,7 @@
411 411 
         {
412 412 
             "type": "frame",
413 413 
             "media_type": "audio",
414 
+            "stream_index": 0,
414 415 
             "key_frame": 1,
415 416 
             "pkt_pts": 5120,
416 417 
             "pkt_pts_time": "0.116100",
... ... 
@@ -443,6 +455,7 @@
443 443 
         {
444 444 
             "type": "frame",
445 445 
             "media_type": "video",
446 
+            "stream_index": 1,
446 447 
             "key_frame": 1,
447 448 
             "pkt_pts": 6144,
448 449 
             "pkt_pts_time": "0.120000",
... ... 
@@ -482,6 +495,7 @@
482 482 
         {
483 483 
             "type": "frame",
484 484 
             "media_type": "video",
485 
+            "stream_index": 2,
485 486 
             "key_frame": 1,
486 487 
             "pkt_pts": 6144,
487 488 
             "pkt_pts_time": "0.120000",
tests/ref/fate/ffprobe_xml
History View file @ 09ec31c
... ... 
@@ -2,33 +2,33 @@
2 2 
 <ffprobe>
3 3 
     <packets_and_frames>
4 4 
         <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="642" flags="K"/>
5 
-        <frame media_type="audio" 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="642" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
5 
+        <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="642" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
6 6 
         <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="2717" flags="K"/>
7 
-        <frame media_type="video" 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="2717" 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"/>
7 
+        <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="2717" 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"/>
8 8 
         <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="233138" flags="K"/>
9 
-        <frame media_type="video" 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="233138" 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"/>
9 
+        <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="233138" 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"/>
10 10 
         <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="263143" flags="K"/>
11 
-        <frame media_type="audio" 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="263143" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
11 
+        <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="263143" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
12 12 
         <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="265221" flags="K"/>
13 
-        <frame media_type="video" 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="265221" 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"/>
13 
+        <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="265221" 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"/>
14 14 
         <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="495645" flags="K"/>
15 
-        <frame media_type="video" 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="495645" 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"/>
15 
+        <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="495645" 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"/>
16 16 
         <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="525650" flags="K"/>
17 
-        <frame media_type="audio" 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="525650" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
17 
+        <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="525650" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
18 18 
         <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="527721" flags="K"/>
19 
-        <frame media_type="audio" 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="527721" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
19 
+        <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="527721" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
20 20 
         <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="529799" flags="K"/>
21 
-        <frame media_type="video" 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="529799" 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"/>
21 
+        <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="529799" 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"/>
22 22 
         <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="760223" flags="K"/>
23 
-        <frame media_type="video" 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="760223" 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"/>
23 
+        <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="760223" 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"/>
24 24 
         <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="790228" flags="K"/>
25 
-        <frame media_type="audio" 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="790228" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
25 
+        <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="790228" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
26 26 
         <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="792299" flags="K"/>
27 
-        <frame media_type="audio" 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="792299" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
27 
+        <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="792299" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
28 28 
         <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="794377" flags="K"/>
29 
-        <frame media_type="video" 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="794377" 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"/>
29 
+        <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="794377" 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"/>
30 30 
         <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="1024801" flags="K"/>
31 
-        <frame media_type="video" 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="1024801" 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"/>
31 
+        <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="1024801" 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"/>
32 32 
     </packets_and_frames>
33 33
34 34 
     <streams>