diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index cc3d1b63f7..1bc1fb5bb4 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -61,6 +61,8 @@ + + diff --git a/ffprobe.c b/ffprobe.c index 71e801f6eb..f882d25045 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1725,6 +1725,8 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, print_time("pkt_pts_time", frame->pkt_pts, &stream->time_base); print_ts ("pkt_dts", frame->pkt_dts); print_time("pkt_dts_time", frame->pkt_dts, &stream->time_base); + print_ts ("best_effort_timestamp", av_frame_get_best_effort_timestamp(frame)); + print_time("best_effort_timestamp_time", av_frame_get_best_effort_timestamp(frame), &stream->time_base); print_duration_ts ("pkt_duration", av_frame_get_pkt_duration(frame)); print_duration_time("pkt_duration_time", av_frame_get_pkt_duration(frame), &stream->time_base); if (av_frame_get_pkt_pos (frame) != -1) print_fmt ("pkt_pos", "%"PRId64, av_frame_get_pkt_pos(frame)); diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index eb82edb473..c74454407d 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=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|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +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=572|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=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|pkt_size=N/A|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|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=2647|pkt_size=N/A|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=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|pkt_size=N/A|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|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=233068|pkt_size=N/A|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=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|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +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=263073|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=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|pkt_size=N/A|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|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=265151|pkt_size=N/A|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=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|pkt_size=N/A|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|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=495575|pkt_size=N/A|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=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|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +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=525580|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=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|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +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=527651|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=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|pkt_size=N/A|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|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=529729|pkt_size=N/A|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=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|pkt_size=N/A|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|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=760153|pkt_size=N/A|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=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|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +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=790158|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=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|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +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=792229|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=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|pkt_size=N/A|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|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=794307|pkt_size=N/A|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=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|pkt_size=N/A|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|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=1024731|pkt_size=N/A|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|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=N/A|duration=N/A|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=N/A|duration=N/A|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 diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 10d1bf1adc..88ed221e54 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,572,K -frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,unknown +frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,572,2048,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,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,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,233068,K -frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,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,263073,K -frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,unknown +frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,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,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,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,495575,K -frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,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,525580,K -frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,unknown +frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,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,2048,s16,1024,1,unknown +frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,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,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,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,760153,K -frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,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,790158,K -frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,unknown +frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,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,2048,s16,1024,1,unknown +frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,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,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,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,1024731,K -frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,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,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,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 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,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index c6d9b28f16..76b9ed8694 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -20,6 +20,8 @@ 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=572 @@ -51,6 +53,8 @@ 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=2647 @@ -88,6 +92,8 @@ 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=233068 @@ -125,6 +131,8 @@ 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=263073 @@ -156,6 +164,8 @@ 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=265151 @@ -193,6 +203,8 @@ 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=495575 @@ -230,6 +242,8 @@ 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=525580 @@ -261,6 +275,8 @@ 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=527651 @@ -292,6 +308,8 @@ 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=529729 @@ -329,6 +347,8 @@ 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=760153 @@ -366,6 +386,8 @@ 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=790158 @@ -397,6 +419,8 @@ 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=792229 @@ -428,6 +452,8 @@ 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=794307 @@ -465,6 +491,8 @@ 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=1024731 diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index ae280b79c4..44a1dcf90a 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -17,6 +17,8 @@ packets_and_frames.frame.0.pkt_pts=0 packets_and_frames.frame.0.pkt_pts_time="0.000000" packets_and_frames.frame.0.pkt_dts=0 packets_and_frames.frame.0.pkt_dts_time="0.000000" +packets_and_frames.frame.0.best_effort_timestamp=0 +packets_and_frames.frame.0.best_effort_timestamp_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="572" @@ -44,6 +46,8 @@ packets_and_frames.frame.1.pkt_pts=0 packets_and_frames.frame.1.pkt_pts_time="0.000000" packets_and_frames.frame.1.pkt_dts=0 packets_and_frames.frame.1.pkt_dts_time="0.000000" +packets_and_frames.frame.1.best_effort_timestamp=0 +packets_and_frames.frame.1.best_effort_timestamp_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="2647" @@ -77,6 +81,8 @@ packets_and_frames.frame.2.pkt_pts=0 packets_and_frames.frame.2.pkt_pts_time="0.000000" packets_and_frames.frame.2.pkt_dts=0 packets_and_frames.frame.2.pkt_dts_time="0.000000" +packets_and_frames.frame.2.best_effort_timestamp=0 +packets_and_frames.frame.2.best_effort_timestamp_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="233068" @@ -110,6 +116,8 @@ packets_and_frames.frame.3.pkt_pts=1024 packets_and_frames.frame.3.pkt_pts_time="0.023220" packets_and_frames.frame.3.pkt_dts=1024 packets_and_frames.frame.3.pkt_dts_time="0.023220" +packets_and_frames.frame.3.best_effort_timestamp=1024 +packets_and_frames.frame.3.best_effort_timestamp_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="263073" @@ -137,6 +145,8 @@ packets_and_frames.frame.4.pkt_pts=2048 packets_and_frames.frame.4.pkt_pts_time="0.040000" packets_and_frames.frame.4.pkt_dts=2048 packets_and_frames.frame.4.pkt_dts_time="0.040000" +packets_and_frames.frame.4.best_effort_timestamp=2048 +packets_and_frames.frame.4.best_effort_timestamp_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="265151" @@ -170,6 +180,8 @@ packets_and_frames.frame.5.pkt_pts=2048 packets_and_frames.frame.5.pkt_pts_time="0.040000" packets_and_frames.frame.5.pkt_dts=2048 packets_and_frames.frame.5.pkt_dts_time="0.040000" +packets_and_frames.frame.5.best_effort_timestamp=2048 +packets_and_frames.frame.5.best_effort_timestamp_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="495575" @@ -203,6 +215,8 @@ packets_and_frames.frame.6.pkt_pts=2048 packets_and_frames.frame.6.pkt_pts_time="0.046440" packets_and_frames.frame.6.pkt_dts=2048 packets_and_frames.frame.6.pkt_dts_time="0.046440" +packets_and_frames.frame.6.best_effort_timestamp=2048 +packets_and_frames.frame.6.best_effort_timestamp_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="525580" @@ -230,6 +244,8 @@ packets_and_frames.frame.7.pkt_pts=3072 packets_and_frames.frame.7.pkt_pts_time="0.069660" packets_and_frames.frame.7.pkt_dts=3072 packets_and_frames.frame.7.pkt_dts_time="0.069660" +packets_and_frames.frame.7.best_effort_timestamp=3072 +packets_and_frames.frame.7.best_effort_timestamp_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="527651" @@ -257,6 +273,8 @@ packets_and_frames.frame.8.pkt_pts=4096 packets_and_frames.frame.8.pkt_pts_time="0.080000" packets_and_frames.frame.8.pkt_dts=4096 packets_and_frames.frame.8.pkt_dts_time="0.080000" +packets_and_frames.frame.8.best_effort_timestamp=4096 +packets_and_frames.frame.8.best_effort_timestamp_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="529729" @@ -290,6 +308,8 @@ packets_and_frames.frame.9.pkt_pts=4096 packets_and_frames.frame.9.pkt_pts_time="0.080000" packets_and_frames.frame.9.pkt_dts=4096 packets_and_frames.frame.9.pkt_dts_time="0.080000" +packets_and_frames.frame.9.best_effort_timestamp=4096 +packets_and_frames.frame.9.best_effort_timestamp_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="760153" @@ -323,6 +343,8 @@ packets_and_frames.frame.10.pkt_pts=4096 packets_and_frames.frame.10.pkt_pts_time="0.092880" packets_and_frames.frame.10.pkt_dts=4096 packets_and_frames.frame.10.pkt_dts_time="0.092880" +packets_and_frames.frame.10.best_effort_timestamp=4096 +packets_and_frames.frame.10.best_effort_timestamp_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="790158" @@ -350,6 +372,8 @@ packets_and_frames.frame.11.pkt_pts=5120 packets_and_frames.frame.11.pkt_pts_time="0.116100" packets_and_frames.frame.11.pkt_dts=5120 packets_and_frames.frame.11.pkt_dts_time="0.116100" +packets_and_frames.frame.11.best_effort_timestamp=5120 +packets_and_frames.frame.11.best_effort_timestamp_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="792229" @@ -377,6 +401,8 @@ packets_and_frames.frame.12.pkt_pts=6144 packets_and_frames.frame.12.pkt_pts_time="0.120000" packets_and_frames.frame.12.pkt_dts=6144 packets_and_frames.frame.12.pkt_dts_time="0.120000" +packets_and_frames.frame.12.best_effort_timestamp=6144 +packets_and_frames.frame.12.best_effort_timestamp_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="794307" @@ -410,6 +436,8 @@ packets_and_frames.frame.13.pkt_pts=6144 packets_and_frames.frame.13.pkt_pts_time="0.120000" packets_and_frames.frame.13.pkt_dts=6144 packets_and_frames.frame.13.pkt_dts_time="0.120000" +packets_and_frames.frame.13.best_effort_timestamp=6144 +packets_and_frames.frame.13.best_effort_timestamp_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="1024731" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index c47a0c4e90..77f84e822a 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -22,6 +22,8 @@ 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=572 @@ -53,6 +55,8 @@ 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=2647 @@ -90,6 +94,8 @@ 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=233068 @@ -127,6 +133,8 @@ 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=263073 @@ -158,6 +166,8 @@ 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=265151 @@ -195,6 +205,8 @@ 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=495575 @@ -232,6 +244,8 @@ 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=525580 @@ -263,6 +277,8 @@ 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=527651 @@ -294,6 +310,8 @@ 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=529729 @@ -331,6 +349,8 @@ 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=760153 @@ -368,6 +388,8 @@ 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=790158 @@ -399,6 +421,8 @@ 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=792229 @@ -430,6 +454,8 @@ 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=794307 @@ -467,6 +493,8 @@ 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=1024731 diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index f0bdb19714..12bd1a2925 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -22,6 +22,8 @@ "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": "572", @@ -52,6 +54,8 @@ "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": "2647", @@ -88,6 +92,8 @@ "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": "233068", @@ -124,6 +130,8 @@ "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": "263073", @@ -154,6 +162,8 @@ "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": "265151", @@ -190,6 +200,8 @@ "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": "495575", @@ -226,6 +238,8 @@ "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": "525580", @@ -256,6 +270,8 @@ "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": "527651", @@ -286,6 +302,8 @@ "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": "529729", @@ -322,6 +340,8 @@ "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": "760153", @@ -358,6 +378,8 @@ "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": "790158", @@ -388,6 +410,8 @@ "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": "792229", @@ -418,6 +442,8 @@ "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": "794307", @@ -454,6 +480,8 @@ "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": "1024731", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 0abca38e82..1da25d74ce 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -2,33 +2,33 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - +