From 09ec31ce3aab41407965e7a95b7d145702434c26 Mon Sep 17 00:00:00 2001 From: Dave Rice Date: Mon, 25 May 2015 20:46:12 -0400 Subject: [PATCH] ffprobe: print stream_index with frame data This makes it easier to relate frame data to its associated stream. --- doc/ffprobe.xsd | 1 + ffprobe.c | 1 + tests/ref/fate/ffprobe_compact | 28 ++++++++++++++-------------- tests/ref/fate/ffprobe_csv | 28 ++++++++++++++-------------- tests/ref/fate/ffprobe_default | 14 ++++++++++++++ tests/ref/fate/ffprobe_flat | 14 ++++++++++++++ tests/ref/fate/ffprobe_ini | 14 ++++++++++++++ tests/ref/fate/ffprobe_json | 14 ++++++++++++++ tests/ref/fate/ffprobe_xml | 28 ++++++++++++++-------------- 9 files changed, 100 insertions(+), 42 deletions(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 1481ad9eb0..c7d5101965 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -87,6 +87,7 @@ + diff --git a/ffprobe.c b/ffprobe.c index fadcd9336e..415836b72a 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1824,6 +1824,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, s = av_get_media_type_string(stream->codec->codec_type); if (s) print_str ("media_type", s); else print_str_opt("media_type", "unknown"); + print_int("stream_index", stream->index); print_int("key_frame", frame->key_frame); print_ts ("pkt_pts", frame->pkt_pts); print_time("pkt_pts_time", frame->pkt_pts, &stream->time_base); diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index fb0b834705..0d9ef30367 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -1,31 +1,31 @@ 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 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 -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 +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 stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/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 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 diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 496477fc44..9186ebae8b 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,31 +1,31 @@ packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,642,K -frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown +frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2717,K -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 +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 packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233138,K -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 +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 packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263143,K -frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown +frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265221,K -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 +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 packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495645,K -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 +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 packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525650,K -frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown +frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527721,K -frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown +frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529799,K -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 +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 packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760223,K -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 +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 packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790228,K -frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown +frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792299,K -frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown +frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794377,K -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 +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 packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024801,K -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 +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 stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le stream,1,rawvideo,unknown,video,1/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 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 diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 123208a09d..df977960d1 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -15,6 +15,7 @@ flags=K [/PACKET] [FRAME] media_type=audio +stream_index=0 key_frame=1 pkt_pts=0 pkt_pts_time=0.000000 @@ -48,6 +49,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=1 key_frame=1 pkt_pts=0 pkt_pts_time=0.000000 @@ -87,6 +89,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=2 key_frame=1 pkt_pts=0 pkt_pts_time=0.000000 @@ -126,6 +129,7 @@ flags=K [/PACKET] [FRAME] media_type=audio +stream_index=0 key_frame=1 pkt_pts=1024 pkt_pts_time=0.023220 @@ -159,6 +163,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=1 key_frame=1 pkt_pts=2048 pkt_pts_time=0.040000 @@ -198,6 +203,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=2 key_frame=1 pkt_pts=2048 pkt_pts_time=0.040000 @@ -237,6 +243,7 @@ flags=K [/PACKET] [FRAME] media_type=audio +stream_index=0 key_frame=1 pkt_pts=2048 pkt_pts_time=0.046440 @@ -270,6 +277,7 @@ flags=K [/PACKET] [FRAME] media_type=audio +stream_index=0 key_frame=1 pkt_pts=3072 pkt_pts_time=0.069660 @@ -303,6 +311,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=1 key_frame=1 pkt_pts=4096 pkt_pts_time=0.080000 @@ -342,6 +351,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=2 key_frame=1 pkt_pts=4096 pkt_pts_time=0.080000 @@ -381,6 +391,7 @@ flags=K [/PACKET] [FRAME] media_type=audio +stream_index=0 key_frame=1 pkt_pts=4096 pkt_pts_time=0.092880 @@ -414,6 +425,7 @@ flags=K [/PACKET] [FRAME] media_type=audio +stream_index=0 key_frame=1 pkt_pts=5120 pkt_pts_time=0.116100 @@ -447,6 +459,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=1 key_frame=1 pkt_pts=6144 pkt_pts_time=0.120000 @@ -486,6 +499,7 @@ flags=K [/PACKET] [FRAME] media_type=video +stream_index=2 key_frame=1 pkt_pts=6144 pkt_pts_time=0.120000 diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index 5c02a21d66..5a8cb774d1 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -12,6 +12,7 @@ packets_and_frames.packet.0.size="2048" packets_and_frames.packet.0.pos="642" packets_and_frames.packet.0.flags="K" packets_and_frames.frame.0.media_type="audio" +packets_and_frames.frame.0.stream_index=0 packets_and_frames.frame.0.key_frame=1 packets_and_frames.frame.0.pkt_pts=0 packets_and_frames.frame.0.pkt_pts_time="0.000000" @@ -41,6 +42,7 @@ packets_and_frames.packet.1.size="230400" packets_and_frames.packet.1.pos="2717" packets_and_frames.packet.1.flags="K" packets_and_frames.frame.1.media_type="video" +packets_and_frames.frame.1.stream_index=1 packets_and_frames.frame.1.key_frame=1 packets_and_frames.frame.1.pkt_pts=0 packets_and_frames.frame.1.pkt_pts_time="0.000000" @@ -76,6 +78,7 @@ packets_and_frames.packet.2.size="30000" packets_and_frames.packet.2.pos="233138" packets_and_frames.packet.2.flags="K" packets_and_frames.frame.2.media_type="video" +packets_and_frames.frame.2.stream_index=2 packets_and_frames.frame.2.key_frame=1 packets_and_frames.frame.2.pkt_pts=0 packets_and_frames.frame.2.pkt_pts_time="0.000000" @@ -111,6 +114,7 @@ packets_and_frames.packet.3.size="2048" packets_and_frames.packet.3.pos="263143" packets_and_frames.packet.3.flags="K" packets_and_frames.frame.3.media_type="audio" +packets_and_frames.frame.3.stream_index=0 packets_and_frames.frame.3.key_frame=1 packets_and_frames.frame.3.pkt_pts=1024 packets_and_frames.frame.3.pkt_pts_time="0.023220" @@ -140,6 +144,7 @@ packets_and_frames.packet.4.size="230400" packets_and_frames.packet.4.pos="265221" packets_and_frames.packet.4.flags="K" packets_and_frames.frame.4.media_type="video" +packets_and_frames.frame.4.stream_index=1 packets_and_frames.frame.4.key_frame=1 packets_and_frames.frame.4.pkt_pts=2048 packets_and_frames.frame.4.pkt_pts_time="0.040000" @@ -175,6 +180,7 @@ packets_and_frames.packet.5.size="30000" packets_and_frames.packet.5.pos="495645" packets_and_frames.packet.5.flags="K" packets_and_frames.frame.5.media_type="video" +packets_and_frames.frame.5.stream_index=2 packets_and_frames.frame.5.key_frame=1 packets_and_frames.frame.5.pkt_pts=2048 packets_and_frames.frame.5.pkt_pts_time="0.040000" @@ -210,6 +216,7 @@ packets_and_frames.packet.6.size="2048" packets_and_frames.packet.6.pos="525650" packets_and_frames.packet.6.flags="K" packets_and_frames.frame.6.media_type="audio" +packets_and_frames.frame.6.stream_index=0 packets_and_frames.frame.6.key_frame=1 packets_and_frames.frame.6.pkt_pts=2048 packets_and_frames.frame.6.pkt_pts_time="0.046440" @@ -239,6 +246,7 @@ packets_and_frames.packet.7.size="2048" packets_and_frames.packet.7.pos="527721" packets_and_frames.packet.7.flags="K" packets_and_frames.frame.7.media_type="audio" +packets_and_frames.frame.7.stream_index=0 packets_and_frames.frame.7.key_frame=1 packets_and_frames.frame.7.pkt_pts=3072 packets_and_frames.frame.7.pkt_pts_time="0.069660" @@ -268,6 +276,7 @@ packets_and_frames.packet.8.size="230400" packets_and_frames.packet.8.pos="529799" packets_and_frames.packet.8.flags="K" packets_and_frames.frame.8.media_type="video" +packets_and_frames.frame.8.stream_index=1 packets_and_frames.frame.8.key_frame=1 packets_and_frames.frame.8.pkt_pts=4096 packets_and_frames.frame.8.pkt_pts_time="0.080000" @@ -303,6 +312,7 @@ packets_and_frames.packet.9.size="30000" packets_and_frames.packet.9.pos="760223" packets_and_frames.packet.9.flags="K" packets_and_frames.frame.9.media_type="video" +packets_and_frames.frame.9.stream_index=2 packets_and_frames.frame.9.key_frame=1 packets_and_frames.frame.9.pkt_pts=4096 packets_and_frames.frame.9.pkt_pts_time="0.080000" @@ -338,6 +348,7 @@ packets_and_frames.packet.10.size="2048" packets_and_frames.packet.10.pos="790228" packets_and_frames.packet.10.flags="K" packets_and_frames.frame.10.media_type="audio" +packets_and_frames.frame.10.stream_index=0 packets_and_frames.frame.10.key_frame=1 packets_and_frames.frame.10.pkt_pts=4096 packets_and_frames.frame.10.pkt_pts_time="0.092880" @@ -367,6 +378,7 @@ packets_and_frames.packet.11.size="2048" packets_and_frames.packet.11.pos="792299" packets_and_frames.packet.11.flags="K" packets_and_frames.frame.11.media_type="audio" +packets_and_frames.frame.11.stream_index=0 packets_and_frames.frame.11.key_frame=1 packets_and_frames.frame.11.pkt_pts=5120 packets_and_frames.frame.11.pkt_pts_time="0.116100" @@ -396,6 +408,7 @@ packets_and_frames.packet.12.size="230400" packets_and_frames.packet.12.pos="794377" packets_and_frames.packet.12.flags="K" packets_and_frames.frame.12.media_type="video" +packets_and_frames.frame.12.stream_index=1 packets_and_frames.frame.12.key_frame=1 packets_and_frames.frame.12.pkt_pts=6144 packets_and_frames.frame.12.pkt_pts_time="0.120000" @@ -431,6 +444,7 @@ packets_and_frames.packet.13.size="30000" packets_and_frames.packet.13.pos="1024801" packets_and_frames.packet.13.flags="K" packets_and_frames.frame.13.media_type="video" +packets_and_frames.frame.13.stream_index=2 packets_and_frames.frame.13.key_frame=1 packets_and_frames.frame.13.pkt_pts=6144 packets_and_frames.frame.13.pkt_pts_time="0.120000" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index e30c2fe450..db5ea8bf70 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -17,6 +17,7 @@ flags=K [packets_and_frames.frame.0] media_type=audio +stream_index=0 key_frame=1 pkt_pts=0 pkt_pts_time=0.000000 @@ -50,6 +51,7 @@ flags=K [packets_and_frames.frame.1] media_type=video +stream_index=1 key_frame=1 pkt_pts=0 pkt_pts_time=0.000000 @@ -89,6 +91,7 @@ flags=K [packets_and_frames.frame.2] media_type=video +stream_index=2 key_frame=1 pkt_pts=0 pkt_pts_time=0.000000 @@ -128,6 +131,7 @@ flags=K [packets_and_frames.frame.3] media_type=audio +stream_index=0 key_frame=1 pkt_pts=1024 pkt_pts_time=0.023220 @@ -161,6 +165,7 @@ flags=K [packets_and_frames.frame.4] media_type=video +stream_index=1 key_frame=1 pkt_pts=2048 pkt_pts_time=0.040000 @@ -200,6 +205,7 @@ flags=K [packets_and_frames.frame.5] media_type=video +stream_index=2 key_frame=1 pkt_pts=2048 pkt_pts_time=0.040000 @@ -239,6 +245,7 @@ flags=K [packets_and_frames.frame.6] media_type=audio +stream_index=0 key_frame=1 pkt_pts=2048 pkt_pts_time=0.046440 @@ -272,6 +279,7 @@ flags=K [packets_and_frames.frame.7] media_type=audio +stream_index=0 key_frame=1 pkt_pts=3072 pkt_pts_time=0.069660 @@ -305,6 +313,7 @@ flags=K [packets_and_frames.frame.8] media_type=video +stream_index=1 key_frame=1 pkt_pts=4096 pkt_pts_time=0.080000 @@ -344,6 +353,7 @@ flags=K [packets_and_frames.frame.9] media_type=video +stream_index=2 key_frame=1 pkt_pts=4096 pkt_pts_time=0.080000 @@ -383,6 +393,7 @@ flags=K [packets_and_frames.frame.10] media_type=audio +stream_index=0 key_frame=1 pkt_pts=4096 pkt_pts_time=0.092880 @@ -416,6 +427,7 @@ flags=K [packets_and_frames.frame.11] media_type=audio +stream_index=0 key_frame=1 pkt_pts=5120 pkt_pts_time=0.116100 @@ -449,6 +461,7 @@ flags=K [packets_and_frames.frame.12] media_type=video +stream_index=1 key_frame=1 pkt_pts=6144 pkt_pts_time=0.120000 @@ -488,6 +501,7 @@ flags=K [packets_and_frames.frame.13] media_type=video +stream_index=2 key_frame=1 pkt_pts=6144 pkt_pts_time=0.120000 diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index ee2f8e6da9..64108cea14 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -17,6 +17,7 @@ { "type": "frame", "media_type": "audio", + "stream_index": 0, "key_frame": 1, "pkt_pts": 0, "pkt_pts_time": "0.000000", @@ -49,6 +50,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 1, "key_frame": 1, "pkt_pts": 0, "pkt_pts_time": "0.000000", @@ -88,6 +90,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 2, "key_frame": 1, "pkt_pts": 0, "pkt_pts_time": "0.000000", @@ -127,6 +130,7 @@ { "type": "frame", "media_type": "audio", + "stream_index": 0, "key_frame": 1, "pkt_pts": 1024, "pkt_pts_time": "0.023220", @@ -159,6 +163,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 1, "key_frame": 1, "pkt_pts": 2048, "pkt_pts_time": "0.040000", @@ -198,6 +203,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 2, "key_frame": 1, "pkt_pts": 2048, "pkt_pts_time": "0.040000", @@ -237,6 +243,7 @@ { "type": "frame", "media_type": "audio", + "stream_index": 0, "key_frame": 1, "pkt_pts": 2048, "pkt_pts_time": "0.046440", @@ -269,6 +276,7 @@ { "type": "frame", "media_type": "audio", + "stream_index": 0, "key_frame": 1, "pkt_pts": 3072, "pkt_pts_time": "0.069660", @@ -301,6 +309,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 1, "key_frame": 1, "pkt_pts": 4096, "pkt_pts_time": "0.080000", @@ -340,6 +349,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 2, "key_frame": 1, "pkt_pts": 4096, "pkt_pts_time": "0.080000", @@ -379,6 +389,7 @@ { "type": "frame", "media_type": "audio", + "stream_index": 0, "key_frame": 1, "pkt_pts": 4096, "pkt_pts_time": "0.092880", @@ -411,6 +422,7 @@ { "type": "frame", "media_type": "audio", + "stream_index": 0, "key_frame": 1, "pkt_pts": 5120, "pkt_pts_time": "0.116100", @@ -443,6 +455,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 1, "key_frame": 1, "pkt_pts": 6144, "pkt_pts_time": "0.120000", @@ -482,6 +495,7 @@ { "type": "frame", "media_type": "video", + "stream_index": 2, "key_frame": 1, "pkt_pts": 6144, "pkt_pts_time": "0.120000", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 5dad3e7ba1..2fdd81bf61 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -2,33 +2,33 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - +