diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 23:51:35 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 01:09:12 +0200 |
commit | 4abc411b97d72080fe9628650f5c1a1d272e7a3d (patch) | |
tree | 58c40571503b17bb7ab5d9fb327676297b7b0894 | |
parent | e3fb5bc1472c600af628df10e1472a4319781640 (diff) | |
download | ffmpeg-4abc411b97d72080fe9628650f5c1a1d272e7a3d.tar.gz |
nutenc: choose for non audio streams a timebase with finer resolution.
While a 25 fps stream can in general store frame durations in 1/25
units, this is not true for the timestamps. For example a 25fps
and a 25000/1001 fps stream when they are stored together might have
a matching 0 timestamp point but when for example a chapter from
this is cut the new start is no longer aligned. The issue gets
MUCH worse when the streams are lower fps, like 1 or 2 fps.
This commit thus makes the muxer choose a multiple of the
framerate as timebase that is at least about 20 micro seconds precise
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
57 files changed, 1081 insertions, 1069 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 5133adee08..1402634442 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -156,10 +156,16 @@ static void build_frame_code(AVFormatContext *s){ int is_audio= codec->codec_type == AVMEDIA_TYPE_AUDIO; int intra_only= /*codec->intra_only || */is_audio; int pred_count; - int frame_size = av_get_audio_frame_duration(codec, 0); - - if (codec->codec_id == AV_CODEC_ID_VORBIS && !frame_size) { - frame_size = 64; + int frame_size = 0; + + if (codec->codec_type == AVMEDIA_TYPE_AUDIO) { + frame_size = av_get_audio_frame_duration(codec, 0); + if (codec->codec_id == AV_CODEC_ID_VORBIS && !frame_size) + frame_size = 64; + } else { + AVRational f = av_div_q(codec->time_base, *nut->stream[stream_id].time_base); + if(f.den == 1 && f.num>0) + frame_size = f.num; } if(!frame_size) frame_size = 1; @@ -669,6 +675,12 @@ static int nut_write_header(AVFormatContext *s){ if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->sample_rate) { time_base = (AVRational){1, st->codec->sample_rate}; + } else { + for (j=2; j<2000; j+= 1+(j>2)) + while (time_base.den / time_base.num < 48000 && time_base.num % j == 0) + time_base.num /= j; + while (time_base.den / time_base.num < 48000 && time_base.den < (1<<24)) + time_base.den <<= 1; } avpriv_set_pts_info(st, 64, time_base.num, time_base.den); diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index 49b77c6247..bb5be42aef 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -1,32 +1,32 @@ -packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=477|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=477|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=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2552|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=1|pkt_duration_time=0.040000|pkt_pos=2552|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=232973|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=1|pkt_duration_time=0.040000|pkt_pos=232973|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=262978|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=262978|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=1|pts_time=0.040000|dts=1|dts_time=0.040000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265054|flags=K -frame|media_type=video|key_frame=1|pkt_pts=1|pkt_pts_time=0.040000|pkt_dts=1|pkt_dts_time=0.040000|pkt_duration=1|pkt_duration_time=0.040000|pkt_pos=265054|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=video|stream_index=2|pts=1|pts_time=0.040000|dts=1|dts_time=0.040000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495476|flags=K -frame|media_type=video|key_frame=1|pkt_pts=1|pkt_pts_time=0.040000|pkt_dts=1|pkt_dts_time=0.040000|pkt_duration=1|pkt_duration_time=0.040000|pkt_pos=495476|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525481|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=525481|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=527552|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=527552|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=2|pts_time=0.080000|dts=2|dts_time=0.080000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529628|flags=K -frame|media_type=video|key_frame=1|pkt_pts=2|pkt_pts_time=0.080000|pkt_dts=2|pkt_dts_time=0.080000|pkt_duration=1|pkt_duration_time=0.040000|pkt_pos=529628|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=video|stream_index=2|pts=2|pts_time=0.080000|dts=2|dts_time=0.080000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760050|flags=K -frame|media_type=video|key_frame=1|pkt_pts=2|pkt_pts_time=0.080000|pkt_dts=2|pkt_dts_time=0.080000|pkt_duration=1|pkt_duration_time=0.040000|pkt_pos=760050|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790055|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=790055|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=792126|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=792126|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown -packet|codec_type=video|stream_index=1|pts=3|pts_time=0.120000|dts=3|dts_time=0.120000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794202|flags=K -frame|media_type=video|key_frame=1|pkt_pts=3|pkt_pts_time=0.120000|pkt_dts=3|pkt_dts_time=0.120000|pkt_duration=1|pkt_duration_time=0.040000|pkt_pos=794202|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -packet|codec_type=video|stream_index=2|pts=3|pts_time=0.120000|dts=3|dts_time=0.120000|duration=1|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024624|flags=K -frame|media_type=video|key_frame=1|pkt_pts=3|pkt_pts_time=0.120000|pkt_dts=3|pkt_dts_time=0.120000|pkt_duration=1|pkt_duration_time=0.040000|pkt_pos=1024624|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 -stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=[1][0][0][0]|codec_tag=0x0001|sample_fmt=s16|sample_rate=44100|channels=1|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=527350|duration=11.958050|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 -stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|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=0/0|time_base=1/25|start_pts=0|start_time=0.000000|duration_ts=299|duration=11.960000|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 -stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|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=0/0|time_base=1/25|start_pts=0|start_time=0.000000|duration_ts=299|duration=11.960000|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 -format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=11.960000|size=1054699|bit_rate=705484|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€ +packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=487|flags=K +frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=487|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2562|flags=K +frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2562|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=232983|flags=K +frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=232983|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=262988|flags=K +frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=262988|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265066|flags=K +frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265066|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495490|flags=K +frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495490|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525495|flags=K +frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525495|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527566|flags=K +frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527566|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529644|flags=K +frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529644|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760068|flags=K +frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760068|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790073|flags=K +frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790073|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792144|flags=K +frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792144|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown +packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794222|flags=K +frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794222|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024646|flags=K +frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024646|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|reference=0 +stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=[1][0][0][0]|codec_tag=0x0001|sample_fmt=s16|sample_rate=44100|channels=1|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=527364|duration=11.958367|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 +stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=612268|duration=11.958359|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 +stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=612268|duration=11.958359|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 +format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=11.958367|size=1054727|bit_rate=705599|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 075e056be5..23183fc5ef 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,32 +1,32 @@ -packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,477,K -frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,477,s16,1024,1,unknown -packet,video,1,0,0.000000,0,0.000000,1,0.040000,N/A,N/A,230400,2552,K -frame,video,1,0,0.000000,0,0.000000,1,0.040000,2552,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,0,0.000000,0,0.000000,1,0.040000,N/A,N/A,30000,232973,K -frame,video,1,0,0.000000,0,0.000000,1,0.040000,232973,100,100,rgb24,1:1,I,0,0,0,0,0,0 -packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,262978,K -frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,262978,s16,1024,1,unknown -packet,video,1,1,0.040000,1,0.040000,1,0.040000,N/A,N/A,230400,265054,K -frame,video,1,1,0.040000,1,0.040000,1,0.040000,265054,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,1,0.040000,1,0.040000,1,0.040000,N/A,N/A,30000,495476,K -frame,video,1,1,0.040000,1,0.040000,1,0.040000,495476,100,100,rgb24,1:1,I,0,0,0,0,0,0 -packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525481,K -frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525481,s16,1024,1,unknown -packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527552,K -frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527552,s16,1024,1,unknown -packet,video,1,2,0.080000,2,0.080000,1,0.040000,N/A,N/A,230400,529628,K -frame,video,1,2,0.080000,2,0.080000,1,0.040000,529628,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,2,0.080000,2,0.080000,1,0.040000,N/A,N/A,30000,760050,K -frame,video,1,2,0.080000,2,0.080000,1,0.040000,760050,100,100,rgb24,1:1,I,0,0,0,0,0,0 -packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790055,K -frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790055,s16,1024,1,unknown -packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792126,K -frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792126,s16,1024,1,unknown -packet,video,1,3,0.120000,3,0.120000,1,0.040000,N/A,N/A,230400,794202,K -frame,video,1,3,0.120000,3,0.120000,1,0.040000,794202,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,3,0.120000,3,0.120000,1,0.040000,N/A,N/A,30000,1024624,K -frame,video,1,3,0.120000,3,0.120000,1,0.040000,1024624,100,100,rgb24,1:1,I,0,0,0,0,0,0 -stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527350,11.958050,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0 -stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.960000,1054699,705484,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€ +packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,487,K +frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,487,s16,1024,1,unknown +packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2562,K +frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2562,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,232983,K +frame,video,1,0,0.000000,0,0.000000,2048,0.040000,232983,100,100,rgb24,1:1,I,0,0,0,0,0,0 +packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,262988,K +frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,262988,s16,1024,1,unknown +packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265066,K +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265066,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495490,K +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495490,100,100,rgb24,1:1,I,0,0,0,0,0,0 +packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525495,K +frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525495,s16,1024,1,unknown +packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527566,K +frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527566,s16,1024,1,unknown +packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529644,K +frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529644,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760068,K +frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760068,100,100,rgb24,1:1,I,0,0,0,0,0,0 +packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790073,K +frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790073,s16,1024,1,unknown +packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792144,K +frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792144,s16,1024,1,unknown +packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794222,K +frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794222,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024646,K +frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024646,100,100,rgb24,1:1,I,0,0,0,0,0,0 +stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527364,11.958367,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0 +stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612268,11.958359,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 +stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612268,11.958359,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 +format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.958367,1054727,705599,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 3c8a89ed30..a8ddaea87e 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -10,7 +10,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=477 +pos=487 flags=K [/PACKET] [FRAME] @@ -22,7 +22,7 @@ pkt_dts=0 pkt_dts_time=0.000000 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=477 +pkt_pos=487 sample_fmt=s16 nb_samples=1024 channels=1 @@ -35,12 +35,12 @@ pts=0 pts_time=0.000000 dts=0 dts_time=0.000000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=2552 +pos=2562 flags=K [/PACKET] [FRAME] @@ -50,9 +50,9 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=2552 +pkt_pos=2562 width=320 height=240 pix_fmt=rgb24 @@ -72,12 +72,12 @@ pts=0 pts_time=0.000000 dts=0 dts_time=0.000000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=232973 +pos=232983 flags=K [/PACKET] [FRAME] @@ -87,9 +87,9 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=232973 +pkt_pos=232983 width=100 height=100 pix_fmt=rgb24 @@ -114,7 +114,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=262978 +pos=262988 flags=K [/PACKET] [FRAME] @@ -126,7 +126,7 @@ pkt_dts=1024 pkt_dts_time=0.023220 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=262978 +pkt_pos=262988 sample_fmt=s16 nb_samples=1024 channels=1 @@ -135,28 +135,28 @@ channel_layout=unknown [PACKET] codec_type=video stream_index=1 -pts=1 +pts=2048 pts_time=0.040000 -dts=1 +dts=2048 dts_time=0.040000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=265054 +pos=265066 flags=K [/PACKET] [FRAME] media_type=video key_frame=1 -pkt_pts=1 +pkt_pts=2048 pkt_pts_time=0.040000 -pkt_dts=1 +pkt_dts=2048 pkt_dts_time=0.040000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=265054 +pkt_pos=265066 width=320 height=240 pix_fmt=rgb24 @@ -172,28 +172,28 @@ reference=0 [PACKET] codec_type=video stream_index=2 -pts=1 +pts=2048 pts_time=0.040000 -dts=1 +dts=2048 dts_time=0.040000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=495476 +pos=495490 flags=K [/PACKET] [FRAME] media_type=video key_frame=1 -pkt_pts=1 +pkt_pts=2048 pkt_pts_time=0.040000 -pkt_dts=1 +pkt_dts=2048 pkt_dts_time=0.040000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=495476 +pkt_pos=495490 width=100 height=100 pix_fmt=rgb24 @@ -218,7 +218,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=525481 +pos=525495 flags=K [/PACKET] [FRAME] @@ -230,7 +230,7 @@ pkt_dts=2048 pkt_dts_time=0.046440 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=525481 +pkt_pos=525495 sample_fmt=s16 nb_samples=1024 channels=1 @@ -248,7 +248,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=527552 +pos=527566 flags=K [/PACKET] [FRAME] @@ -260,7 +260,7 @@ pkt_dts=3072 pkt_dts_time=0.069660 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=527552 +pkt_pos=527566 sample_fmt=s16 nb_samples=1024 channels=1 @@ -269,28 +269,28 @@ channel_layout=unknown [PACKET] codec_type=video stream_index=1 -pts=2 +pts=4096 pts_time=0.080000 -dts=2 +dts=4096 dts_time=0.080000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=529628 +pos=529644 flags=K [/PACKET] [FRAME] media_type=video key_frame=1 -pkt_pts=2 +pkt_pts=4096 pkt_pts_time=0.080000 -pkt_dts=2 +pkt_dts=4096 pkt_dts_time=0.080000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=529628 +pkt_pos=529644 width=320 height=240 pix_fmt=rgb24 @@ -306,28 +306,28 @@ reference=0 [PACKET] codec_type=video stream_index=2 -pts=2 +pts=4096 pts_time=0.080000 -dts=2 +dts=4096 dts_time=0.080000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=760050 +pos=760068 flags=K [/PACKET] [FRAME] media_type=video key_frame=1 -pkt_pts=2 +pkt_pts=4096 pkt_pts_time=0.080000 -pkt_dts=2 +pkt_dts=4096 pkt_dts_time=0.080000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=760050 +pkt_pos=760068 width=100 height=100 pix_fmt=rgb24 @@ -352,7 +352,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=790055 +pos=790073 flags=K [/PACKET] [FRAME] @@ -364,7 +364,7 @@ pkt_dts=4096 pkt_dts_time=0.092880 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=790055 +pkt_pos=790073 sample_fmt=s16 nb_samples=1024 channels=1 @@ -382,7 +382,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=792126 +pos=792144 flags=K [/PACKET] [FRAME] @@ -394,7 +394,7 @@ pkt_dts=5120 pkt_dts_time=0.116100 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=792126 +pkt_pos=792144 sample_fmt=s16 nb_samples=1024 channels=1 @@ -403,28 +403,28 @@ channel_layout=unknown [PACKET] codec_type=video stream_index=1 -pts=3 +pts=6144 pts_time=0.120000 -dts=3 +dts=6144 dts_time=0.120000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=794202 +pos=794222 flags=K [/PACKET] [FRAME] media_type=video key_frame=1 -pkt_pts=3 +pkt_pts=6144 pkt_pts_time=0.120000 -pkt_dts=3 +pkt_dts=6144 pkt_dts_time=0.120000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=794202 +pkt_pos=794222 width=320 height=240 pix_fmt=rgb24 @@ -440,28 +440,28 @@ reference=0 [PACKET] codec_type=video stream_index=2 -pts=3 +pts=6144 pts_time=0.120000 -dts=3 +dts=6144 dts_time=0.120000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=1024624 +pos=1024646 flags=K [/PACKET] [FRAME] media_type=video key_frame=1 -pkt_pts=3 +pkt_pts=6144 pkt_pts_time=0.120000 -pkt_dts=3 +pkt_dts=6144 pkt_dts_time=0.120000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=1024624 +pkt_pos=1024646 width=100 height=100 pix_fmt=rgb24 @@ -492,8 +492,8 @@ avg_frame_rate=0/0 time_base=1/44100 start_pts=0 start_time=0.000000 -duration_ts=527350 -duration=11.958050 +duration_ts=527364 +duration=11.958367 bit_rate=705600 nb_frames=N/A nb_read_frames=6 @@ -515,7 +515,7 @@ index=1 codec_name=rawvideo profile=unknown codec_type=video -codec_time_base=1/25 +codec_time_base=1/51200 codec_tag_string=RGB[24] codec_tag=0x18424752 width=320 @@ -528,12 +528,12 @@ level=-99 timecode=N/A id=N/A r_frame_rate=25/1 -avg_frame_rate=0/0 -time_base=1/25 +avg_frame_rate=25/1 +time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=299 -duration=11.960000 +duration_ts=612268 +duration=11.958359 bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -555,7 +555,7 @@ index=2 codec_name=rawvideo profile=unknown codec_type=video -codec_time_base=1/25 +codec_time_base=1/51200 codec_tag_string=RGB[24] codec_tag=0x18424752 width=100 @@ -568,12 +568,12 @@ level=-99 timecode=N/A id=N/A r_frame_rate=25/1 -avg_frame_rate=0/0 -time_base=1/25 +avg_frame_rate=25/1 +time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=299 -duration=11.960000 +duration_ts=612268 +duration=11.958359 bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -595,9 +595,9 @@ filename=tests/data/ffprobe-test.nut nb_streams=3 format_name=nut start_time=0.000000 -duration=11.960000 -size=1054699 -bit_rate=705484 +duration=11.958367 +size=1054727 +bit_rate=705599 TAG:title=ffprobe test file TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x"> TAG:comment2=I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index f5201d09ae..493c976093 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -9,7 +9,7 @@ packets_and_frames.packet.0.duration_time="0.023220" packets_and_frames.packet.0.convergence_duration="N/A" packets_and_frames.packet.0.convergence_duration_time="N/A" packets_and_frames.packet.0.size="2048" -packets_and_frames.packet.0.pos="477" +packets_and_frames.packet.0.pos="487" packets_and_frames.packet.0.flags="K" packets_and_frames.frame.0.media_type="audio" packets_and_frames.frame.0.key_frame=1 @@ -19,7 +19,7 @@ packets_and_frames.frame.0.pkt_dts=0 packets_and_frames.frame.0.pkt_dts_time="0.000000" packets_and_frames.frame.0.pkt_duration=1024 packets_and_frames.frame.0.pkt_duration_time="0.023220" -packets_and_frames.frame.0.pkt_pos="477" +packets_and_frames.frame.0.pkt_pos="487" packets_and_frames.frame.0.sample_fmt="s16" packets_and_frames.frame.0.nb_samples=1024 packets_and_frames.frame.0.channels=1 @@ -30,12 +30,12 @@ packets_and_frames.packet.1.pts=0 packets_and_frames.packet.1.pts_time="0.000000" packets_and_frames.packet.1.dts=0 packets_and_frames.packet.1.dts_time="0.000000" -packets_and_frames.packet.1.duration=1 +packets_and_frames.packet.1.duration=2048 packets_and_frames.packet.1.duration_time="0.040000" packets_and_frames.packet.1.convergence_duration="N/A" packets_and_frames.packet.1.convergence_duration_time="N/A" packets_and_frames.packet.1.size="230400" -packets_and_frames.packet.1.pos="2552" +packets_and_frames.packet.1.pos="2562" packets_and_frames.packet.1.flags="K" packets_and_frames.frame.1.media_type="video" packets_and_frames.frame.1.key_frame=1 @@ -43,9 +43,9 @@ 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.pkt_duration=1 +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="2552" +packets_and_frames.frame.1.pkt_pos="2562" packets_and_frames.frame.1.width=320 packets_and_frames.frame.1.height=240 packets_and_frames.frame.1.pix_fmt="rgb24" @@ -63,12 +63,12 @@ packets_and_frames.packet.2.pts=0 packets_and_frames.packet.2.pts_time="0.000000" packets_and_frames.packet.2.dts=0 packets_and_frames.packet.2.dts_time="0.000000" -packets_and_frames.packet.2.duration=1 +packets_and_frames.packet.2.duration=2048 packets_and_frames.packet.2.duration_time="0.040000" packets_and_frames.packet.2.convergence_duration="N/A" packets_and_frames.packet.2.convergence_duration_time="N/A" packets_and_frames.packet.2.size="30000" -packets_and_frames.packet.2.pos="232973" +packets_and_frames.packet.2.pos="232983" packets_and_frames.packet.2.flags="K" packets_and_frames.frame.2.media_type="video" packets_and_frames.frame.2.key_frame=1 @@ -76,9 +76,9 @@ 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.pkt_duration=1 +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="232973" +packets_and_frames.frame.2.pkt_pos="232983" packets_and_frames.frame.2.width=100 packets_and_frames.frame.2.height=100 packets_and_frames.frame.2.pix_fmt="rgb24" @@ -101,7 +101,7 @@ packets_and_frames.packet.3.duration_time="0.023220" packets_and_frames.packet.3.convergence_duration="N/A" packets_and_frames.packet.3.convergence_duration_time="N/A" packets_and_frames.packet.3.size="2048" -packets_and_frames.packet.3.pos="262978" +packets_and_frames.packet.3.pos="262988" packets_and_frames.packet.3.flags="K" packets_and_frames.frame.3.media_type="audio" packets_and_frames.frame.3.key_frame=1 @@ -111,33 +111,33 @@ packets_and_frames.frame.3.pkt_dts=1024 packets_and_frames.frame.3.pkt_dts_time="0.023220" packets_and_frames.frame.3.pkt_duration=1024 packets_and_frames.frame.3.pkt_duration_time="0.023220" -packets_and_frames.frame.3.pkt_pos="262978" +packets_and_frames.frame.3.pkt_pos="262988" packets_and_frames.frame.3.sample_fmt="s16" packets_and_frames.frame.3.nb_samples=1024 packets_and_frames.frame.3.channels=1 packets_and_frames.frame.3.channel_layout="unknown" packets_and_frames.packet.4.codec_type="video" packets_and_frames.packet.4.stream_index=1 -packets_and_frames.packet.4.pts=1 +packets_and_frames.packet.4.pts=2048 packets_and_frames.packet.4.pts_time="0.040000" -packets_and_frames.packet.4.dts=1 +packets_and_frames.packet.4.dts=2048 packets_and_frames.packet.4.dts_time="0.040000" -packets_and_frames.packet.4.duration=1 +packets_and_frames.packet.4.duration=2048 packets_and_frames.packet.4.duration_time="0.040000" packets_and_frames.packet.4.convergence_duration="N/A" packets_and_frames.packet.4.convergence_duration_time="N/A" packets_and_frames.packet.4.size="230400" -packets_and_frames.packet.4.pos="265054" +packets_and_frames.packet.4.pos="265066" packets_and_frames.packet.4.flags="K" packets_and_frames.frame.4.media_type="video" packets_and_frames.frame.4.key_frame=1 -packets_and_frames.frame.4.pkt_pts=1 +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=1 +packets_and_frames.frame.4.pkt_dts=2048 packets_and_frames.frame.4.pkt_dts_time="0.040000" -packets_and_frames.frame.4.pkt_duration=1 +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="265054" +packets_and_frames.frame.4.pkt_pos="265066" packets_and_frames.frame.4.width=320 packets_and_frames.frame.4.height=240 packets_and_frames.frame.4.pix_fmt="rgb24" @@ -151,26 +151,26 @@ packets_and_frames.frame.4.repeat_pict=0 packets_and_frames.frame.4.reference=0 packets_and_frames.packet.5.codec_type="video" packets_and_frames.packet.5.stream_index=2 -packets_and_frames.packet.5.pts=1 +packets_and_frames.packet.5.pts=2048 packets_and_frames.packet.5.pts_time="0.040000" -packets_and_frames.packet.5.dts=1 +packets_and_frames.packet.5.dts=2048 packets_and_frames.packet.5.dts_time="0.040000" -packets_and_frames.packet.5.duration=1 +packets_and_frames.packet.5.duration=2048 packets_and_frames.packet.5.duration_time="0.040000" packets_and_frames.packet.5.convergence_duration="N/A" packets_and_frames.packet.5.convergence_duration_time="N/A" packets_and_frames.packet.5.size="30000" -packets_and_frames.packet.5.pos="495476" +packets_and_frames.packet.5.pos="495490" packets_and_frames.packet.5.flags="K" packets_and_frames.frame.5.media_type="video" packets_and_frames.frame.5.key_frame=1 -packets_and_frames.frame.5.pkt_pts=1 +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=1 +packets_and_frames.frame.5.pkt_dts=2048 packets_and_frames.frame.5.pkt_dts_time="0.040000" -packets_and_frames.frame.5.pkt_duration=1 +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="495476" +packets_and_frames.frame.5.pkt_pos="495490" packets_and_frames.frame.5.width=100 packets_and_frames.frame.5.height=100 packets_and_frames.frame.5.pix_fmt="rgb24" @@ -193,7 +193,7 @@ packets_and_frames.packet.6.duration_time="0.023220" packets_and_frames.packet.6.convergence_duration="N/A" packets_and_frames.packet.6.convergence_duration_time="N/A" packets_and_frames.packet.6.size="2048" -packets_and_frames.packet.6.pos="525481" +packets_and_frames.packet.6.pos="525495" packets_and_frames.packet.6.flags="K" packets_and_frames.frame.6.media_type="audio" packets_and_frames.frame.6.key_frame=1 @@ -203,7 +203,7 @@ packets_and_frames.frame.6.pkt_dts=2048 packets_and_frames.frame.6.pkt_dts_time="0.046440" packets_and_frames.frame.6.pkt_duration=1024 packets_and_frames.frame.6.pkt_duration_time="0.023220" -packets_and_frames.frame.6.pkt_pos="525481" +packets_and_frames.frame.6.pkt_pos="525495" packets_and_frames.frame.6.sample_fmt="s16" packets_and_frames.frame.6.nb_samples=1024 packets_and_frames.frame.6.channels=1 @@ -219,7 +219,7 @@ packets_and_frames.packet.7.duration_time="0.023220" packets_and_frames.packet.7.convergence_duration="N/A" packets_and_frames.packet.7.convergence_duration_time="N/A" packets_and_frames.packet.7.size="2048" -packets_and_frames.packet.7.pos="527552" +packets_and_frames.packet.7.pos="527566" packets_and_frames.packet.7.flags="K" packets_and_frames.frame.7.media_type="audio" packets_and_frames.frame.7.key_frame=1 @@ -229,33 +229,33 @@ packets_and_frames.frame.7.pkt_dts=3072 packets_and_frames.frame.7.pkt_dts_time="0.069660" packets_and_frames.frame.7.pkt_duration=1024 packets_and_frames.frame.7.pkt_duration_time="0.023220" -packets_and_frames.frame.7.pkt_pos="527552" +packets_and_frames.frame.7.pkt_pos="527566" packets_and_frames.frame.7.sample_fmt="s16" packets_and_frames.frame.7.nb_samples=1024 packets_and_frames.frame.7.channels=1 packets_and_frames.frame.7.channel_layout="unknown" packets_and_frames.packet.8.codec_type="video" packets_and_frames.packet.8.stream_index=1 -packets_and_frames.packet.8.pts=2 +packets_and_frames.packet.8.pts=4096 packets_and_frames.packet.8.pts_time="0.080000" -packets_and_frames.packet.8.dts=2 +packets_and_frames.packet.8.dts=4096 packets_and_frames.packet.8.dts_time="0.080000" -packets_and_frames.packet.8.duration=1 +packets_and_frames.packet.8.duration=2048 packets_and_frames.packet.8.duration_time="0.040000" packets_and_frames.packet.8.convergence_duration="N/A" packets_and_frames.packet.8.convergence_duration_time="N/A" packets_and_frames.packet.8.size="230400" -packets_and_frames.packet.8.pos="529628" +packets_and_frames.packet.8.pos="529644" packets_and_frames.packet.8.flags="K" packets_and_frames.frame.8.media_type="video" packets_and_frames.frame.8.key_frame=1 -packets_and_frames.frame.8.pkt_pts=2 +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=2 +packets_and_frames.frame.8.pkt_dts=4096 packets_and_frames.frame.8.pkt_dts_time="0.080000" -packets_and_frames.frame.8.pkt_duration=1 +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="529628" +packets_and_frames.frame.8.pkt_pos="529644" packets_and_frames.frame.8.width=320 packets_and_frames.frame.8.height=240 packets_and_frames.frame.8.pix_fmt="rgb24" @@ -269,26 +269,26 @@ packets_and_frames.frame.8.repeat_pict=0 packets_and_frames.frame.8.reference=0 packets_and_frames.packet.9.codec_type="video" packets_and_frames.packet.9.stream_index=2 -packets_and_frames.packet.9.pts=2 +packets_and_frames.packet.9.pts=4096 packets_and_frames.packet.9.pts_time="0.080000" -packets_and_frames.packet.9.dts=2 +packets_and_frames.packet.9.dts=4096 packets_and_frames.packet.9.dts_time="0.080000" -packets_and_frames.packet.9.duration=1 +packets_and_frames.packet.9.duration=2048 packets_and_frames.packet.9.duration_time="0.040000" packets_and_frames.packet.9.convergence_duration="N/A" packets_and_frames.packet.9.convergence_duration_time="N/A" packets_and_frames.packet.9.size="30000" -packets_and_frames.packet.9.pos="760050" +packets_and_frames.packet.9.pos="760068" packets_and_frames.packet.9.flags="K" packets_and_frames.frame.9.media_type="video" packets_and_frames.frame.9.key_frame=1 -packets_and_frames.frame.9.pkt_pts=2 +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=2 +packets_and_frames.frame.9.pkt_dts=4096 packets_and_frames.frame.9.pkt_dts_time="0.080000" -packets_and_frames.frame.9.pkt_duration=1 +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="760050" +packets_and_frames.frame.9.pkt_pos="760068" packets_and_frames.frame.9.width=100 packets_and_frames.frame.9.height=100 packets_and_frames.frame.9.pix_fmt="rgb24" @@ -311,7 +311,7 @@ packets_and_frames.packet.10.duration_time="0.023220" packets_and_frames.packet.10.convergence_duration="N/A" packets_and_frames.packet.10.convergence_duration_time="N/A" packets_and_frames.packet.10.size="2048" -packets_and_frames.packet.10.pos="790055" +packets_and_frames.packet.10.pos="790073" packets_and_frames.packet.10.flags="K" packets_and_frames.frame.10.media_type="audio" packets_and_frames.frame.10.key_frame=1 @@ -321,7 +321,7 @@ packets_and_frames.frame.10.pkt_dts=4096 packets_and_frames.frame.10.pkt_dts_time="0.092880" packets_and_frames.frame.10.pkt_duration=1024 packets_and_frames.frame.10.pkt_duration_time="0.023220" -packets_and_frames.frame.10.pkt_pos="790055" +packets_and_frames.frame.10.pkt_pos="790073" packets_and_frames.frame.10.sample_fmt="s16" packets_and_frames.frame.10.nb_samples=1024 packets_and_frames.frame.10.channels=1 @@ -337,7 +337,7 @@ packets_and_frames.packet.11.duration_time="0.023220" packets_and_frames.packet.11.convergence_duration="N/A" packets_and_frames.packet.11.convergence_duration_time="N/A" packets_and_frames.packet.11.size="2048" -packets_and_frames.packet.11.pos="792126" +packets_and_frames.packet.11.pos="792144" packets_and_frames.packet.11.flags="K" packets_and_frames.frame.11.media_type="audio" packets_and_frames.frame.11.key_frame=1 @@ -347,33 +347,33 @@ packets_and_frames.frame.11.pkt_dts=5120 packets_and_frames.frame.11.pkt_dts_time="0.116100" packets_and_frames.frame.11.pkt_duration=1024 packets_and_frames.frame.11.pkt_duration_time="0.023220" -packets_and_frames.frame.11.pkt_pos="792126" +packets_and_frames.frame.11.pkt_pos="792144" packets_and_frames.frame.11.sample_fmt="s16" packets_and_frames.frame.11.nb_samples=1024 packets_and_frames.frame.11.channels=1 packets_and_frames.frame.11.channel_layout="unknown" packets_and_frames.packet.12.codec_type="video" packets_and_frames.packet.12.stream_index=1 -packets_and_frames.packet.12.pts=3 +packets_and_frames.packet.12.pts=6144 packets_and_frames.packet.12.pts_time="0.120000" -packets_and_frames.packet.12.dts=3 +packets_and_frames.packet.12.dts=6144 packets_and_frames.packet.12.dts_time="0.120000" -packets_and_frames.packet.12.duration=1 +packets_and_frames.packet.12.duration=2048 packets_and_frames.packet.12.duration_time="0.040000" packets_and_frames.packet.12.convergence_duration="N/A" packets_and_frames.packet.12.convergence_duration_time="N/A" packets_and_frames.packet.12.size="230400" -packets_and_frames.packet.12.pos="794202" +packets_and_frames.packet.12.pos="794222" packets_and_frames.packet.12.flags="K" packets_and_frames.frame.12.media_type="video" packets_and_frames.frame.12.key_frame=1 -packets_and_frames.frame.12.pkt_pts=3 +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=3 +packets_and_frames.frame.12.pkt_dts=6144 packets_and_frames.frame.12.pkt_dts_time="0.120000" -packets_and_frames.frame.12.pkt_duration=1 +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="794202" +packets_and_frames.frame.12.pkt_pos="794222" packets_and_frames.frame.12.width=320 packets_and_frames.frame.12.height=240 packets_and_frames.frame.12.pix_fmt="rgb24" @@ -387,26 +387,26 @@ packets_and_frames.frame.12.repeat_pict=0 packets_and_frames.frame.12.reference=0 packets_and_frames.packet.13.codec_type="video" packets_and_frames.packet.13.stream_index=2 -packets_and_frames.packet.13.pts=3 +packets_and_frames.packet.13.pts=6144 packets_and_frames.packet.13.pts_time="0.120000" -packets_and_frames.packet.13.dts=3 +packets_and_frames.packet.13.dts=6144 packets_and_frames.packet.13.dts_time="0.120000" -packets_and_frames.packet.13.duration=1 +packets_and_frames.packet.13.duration=2048 packets_and_frames.packet.13.duration_time="0.040000" packets_and_frames.packet.13.convergence_duration="N/A" packets_and_frames.packet.13.convergence_duration_time="N/A" packets_and_frames.packet.13.size="30000" -packets_and_frames.packet.13.pos="1024624" +packets_and_frames.packet.13.pos="1024646" packets_and_frames.packet.13.flags="K" packets_and_frames.frame.13.media_type="video" packets_and_frames.frame.13.key_frame=1 -packets_and_frames.frame.13.pkt_pts=3 +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=3 +packets_and_frames.frame.13.pkt_dts=6144 packets_and_frames.frame.13.pkt_dts_time="0.120000" -packets_and_frames.frame.13.pkt_duration=1 +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="1024624" +packets_and_frames.frame.13.pkt_pos="1024646" packets_and_frames.frame.13.width=100 packets_and_frames.frame.13.height=100 packets_and_frames.frame.13.pix_fmt="rgb24" @@ -435,8 +435,8 @@ streams.stream.0.avg_frame_rate="0/0" streams.stream.0.time_base="1/44100" streams.stream.0.start_pts=0 streams.stream.0.start_time="0.000000" -streams.stream.0.duration_ts=527350 -streams.stream.0.duration="11.958050" +streams.stream.0.duration_ts=527364 +streams.stream.0.duration="11.958367" streams.stream.0.bit_rate="705600" streams.stream.0.nb_frames="N/A" streams.stream.0.nb_read_frames="6" @@ -456,7 +456,7 @@ streams.stream.1.index=1 streams.stream.1.codec_name="rawvideo" streams.stream.1.profile="unknown" streams.stream.1.codec_type="video" -streams.stream.1.codec_time_base="1/25" +streams.stream.1.codec_time_base="1/51200" streams.stream.1.codec_tag_string="RGB[24]" streams.stream.1.codec_tag="0x18424752" streams.stream.1.width=320 @@ -469,12 +469,12 @@ streams.stream.1.level=-99 streams.stream.1.timecode="N/A" streams.stream.1.id="N/A" streams.stream.1.r_frame_rate="25/1" -streams.stream.1.avg_frame_rate="0/0" -streams.stream.1.time_base="1/25" +streams.stream.1.avg_frame_rate="25/1" +streams.stream.1.time_base="1/51200" streams.stream.1.start_pts=0 streams.stream.1.start_time="0.000000" -streams.stream.1.duration_ts=299 -streams.stream.1.duration="11.960000" +streams.stream.1.duration_ts=612268 +streams.stream.1.duration="11.958359" streams.stream.1.bit_rate="N/A" streams.stream.1.nb_frames="N/A" streams.stream.1.nb_read_frames="4" @@ -494,7 +494,7 @@ streams.stream.2.index=2 streams.stream.2.codec_name="rawvideo" streams.stream.2.profile="unknown" streams.stream.2.codec_type="video" -streams.stream.2.codec_time_base="1/25" +streams.stream.2.codec_time_base="1/51200" streams.stream.2.codec_tag_string="RGB[24]" streams.stream.2.codec_tag="0x18424752" streams.stream.2.width=100 @@ -507,12 +507,12 @@ streams.stream.2.level=-99 streams.stream.2.timecode="N/A" streams.stream.2.id="N/A" streams.stream.2.r_frame_rate="25/1" -streams.stream.2.avg_frame_rate="0/0" -streams.stream.2.time_base="1/25" +streams.stream.2.avg_frame_rate="25/1" +streams.stream.2.time_base="1/51200" streams.stream.2.start_pts=0 streams.stream.2.start_time="0.000000" -streams.stream.2.duration_ts=299 -streams.stream.2.duration="11.960000" +streams.stream.2.duration_ts=612268 +streams.stream.2.duration="11.958359" streams.stream.2.bit_rate="N/A" streams.stream.2.nb_frames="N/A" streams.stream.2.nb_read_frames="4" @@ -532,9 +532,9 @@ format.filename="tests/data/ffprobe-test.nut" format.nb_streams=3 format.format_name="nut" format.start_time="0.000000" -format.duration="11.960000" -format.size="1054699" -format.bit_rate="705484" +format.duration="11.958367" +format.size="1054727" +format.bit_rate="705599" format.tags.title="ffprobe test file" format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">" format.tags.comment2="I ♥ Üñîçød€" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index dad636b63f..fd01c7c4f3 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -12,7 +12,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=477 +pos=487 flags=K [packets_and_frames.frame.0] @@ -24,7 +24,7 @@ pkt_dts=0 pkt_dts_time=0.000000 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=477 +pkt_pos=487 sample_fmt=s16 nb_samples=1024 channels=1 @@ -37,12 +37,12 @@ pts=0 pts_time=0.000000 dts=0 dts_time=0.000000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=2552 +pos=2562 flags=K [packets_and_frames.frame.1] @@ -52,9 +52,9 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=2552 +pkt_pos=2562 width=320 height=240 pix_fmt=rgb24 @@ -74,12 +74,12 @@ pts=0 pts_time=0.000000 dts=0 dts_time=0.000000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=232973 +pos=232983 flags=K [packets_and_frames.frame.2] @@ -89,9 +89,9 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=232973 +pkt_pos=232983 width=100 height=100 pix_fmt=rgb24 @@ -116,7 +116,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=262978 +pos=262988 flags=K [packets_and_frames.frame.3] @@ -128,7 +128,7 @@ pkt_dts=1024 pkt_dts_time=0.023220 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=262978 +pkt_pos=262988 sample_fmt=s16 nb_samples=1024 channels=1 @@ -137,28 +137,28 @@ channel_layout=unknown [packets_and_frames.packet.4] codec_type=video stream_index=1 -pts=1 +pts=2048 pts_time=0.040000 -dts=1 +dts=2048 dts_time=0.040000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=265054 +pos=265066 flags=K [packets_and_frames.frame.4] media_type=video key_frame=1 -pkt_pts=1 +pkt_pts=2048 pkt_pts_time=0.040000 -pkt_dts=1 +pkt_dts=2048 pkt_dts_time=0.040000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=265054 +pkt_pos=265066 width=320 height=240 pix_fmt=rgb24 @@ -174,28 +174,28 @@ reference=0 [packets_and_frames.packet.5] codec_type=video stream_index=2 -pts=1 +pts=2048 pts_time=0.040000 -dts=1 +dts=2048 dts_time=0.040000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=495476 +pos=495490 flags=K [packets_and_frames.frame.5] media_type=video key_frame=1 -pkt_pts=1 +pkt_pts=2048 pkt_pts_time=0.040000 -pkt_dts=1 +pkt_dts=2048 pkt_dts_time=0.040000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=495476 +pkt_pos=495490 width=100 height=100 pix_fmt=rgb24 @@ -220,7 +220,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=525481 +pos=525495 flags=K [packets_and_frames.frame.6] @@ -232,7 +232,7 @@ pkt_dts=2048 pkt_dts_time=0.046440 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=525481 +pkt_pos=525495 sample_fmt=s16 nb_samples=1024 channels=1 @@ -250,7 +250,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=527552 +pos=527566 flags=K [packets_and_frames.frame.7] @@ -262,7 +262,7 @@ pkt_dts=3072 pkt_dts_time=0.069660 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=527552 +pkt_pos=527566 sample_fmt=s16 nb_samples=1024 channels=1 @@ -271,28 +271,28 @@ channel_layout=unknown [packets_and_frames.packet.8] codec_type=video stream_index=1 -pts=2 +pts=4096 pts_time=0.080000 -dts=2 +dts=4096 dts_time=0.080000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=529628 +pos=529644 flags=K [packets_and_frames.frame.8] media_type=video key_frame=1 -pkt_pts=2 +pkt_pts=4096 pkt_pts_time=0.080000 -pkt_dts=2 +pkt_dts=4096 pkt_dts_time=0.080000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=529628 +pkt_pos=529644 width=320 height=240 pix_fmt=rgb24 @@ -308,28 +308,28 @@ reference=0 [packets_and_frames.packet.9] codec_type=video stream_index=2 -pts=2 +pts=4096 pts_time=0.080000 -dts=2 +dts=4096 dts_time=0.080000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=760050 +pos=760068 flags=K [packets_and_frames.frame.9] media_type=video key_frame=1 -pkt_pts=2 +pkt_pts=4096 pkt_pts_time=0.080000 -pkt_dts=2 +pkt_dts=4096 pkt_dts_time=0.080000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=760050 +pkt_pos=760068 width=100 height=100 pix_fmt=rgb24 @@ -354,7 +354,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=790055 +pos=790073 flags=K [packets_and_frames.frame.10] @@ -366,7 +366,7 @@ pkt_dts=4096 pkt_dts_time=0.092880 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=790055 +pkt_pos=790073 sample_fmt=s16 nb_samples=1024 channels=1 @@ -384,7 +384,7 @@ duration_time=0.023220 convergence_duration=N/A convergence_duration_time=N/A size=2048 -pos=792126 +pos=792144 flags=K [packets_and_frames.frame.11] @@ -396,7 +396,7 @@ pkt_dts=5120 pkt_dts_time=0.116100 pkt_duration=1024 pkt_duration_time=0.023220 -pkt_pos=792126 +pkt_pos=792144 sample_fmt=s16 nb_samples=1024 channels=1 @@ -405,28 +405,28 @@ channel_layout=unknown [packets_and_frames.packet.12] codec_type=video stream_index=1 -pts=3 +pts=6144 pts_time=0.120000 -dts=3 +dts=6144 dts_time=0.120000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=230400 -pos=794202 +pos=794222 flags=K [packets_and_frames.frame.12] media_type=video key_frame=1 -pkt_pts=3 +pkt_pts=6144 pkt_pts_time=0.120000 -pkt_dts=3 +pkt_dts=6144 pkt_dts_time=0.120000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=794202 +pkt_pos=794222 width=320 height=240 pix_fmt=rgb24 @@ -442,28 +442,28 @@ reference=0 [packets_and_frames.packet.13] codec_type=video stream_index=2 -pts=3 +pts=6144 pts_time=0.120000 -dts=3 +dts=6144 dts_time=0.120000 -duration=1 +duration=2048 duration_time=0.040000 convergence_duration=N/A convergence_duration_time=N/A size=30000 -pos=1024624 +pos=1024646 flags=K [packets_and_frames.frame.13] media_type=video key_frame=1 -pkt_pts=3 +pkt_pts=6144 pkt_pts_time=0.120000 -pkt_dts=3 +pkt_dts=6144 pkt_dts_time=0.120000 -pkt_duration=1 +pkt_duration=2048 pkt_duration_time=0.040000 -pkt_pos=1024624 +pkt_pos=1024646 width=100 height=100 pix_fmt=rgb24 @@ -494,8 +494,8 @@ avg_frame_rate=0/0 time_base=1/44100 start_pts=0 start_time=0.000000 -duration_ts=527350 -duration=11.958050 +duration_ts=527364 +duration=11.958367 bit_rate=705600 nb_frames=N/A nb_read_frames=6 @@ -519,7 +519,7 @@ index=1 codec_name=rawvideo profile=unknown codec_type=video -codec_time_base=1/25 +codec_time_base=1/51200 codec_tag_string=RGB[24] codec_tag=0x18424752 width=320 @@ -532,12 +532,12 @@ level=-99 timecode=N/A id=N/A r_frame_rate=25/1 -avg_frame_rate=0/0 -time_base=1/25 +avg_frame_rate=25/1 +time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=299 -duration=11.960000 +duration_ts=612268 +duration=11.958359 bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -561,7 +561,7 @@ index=2 codec_name=rawvideo profile=unknown codec_type=video -codec_time_base=1/25 +codec_time_base=1/51200 codec_tag_string=RGB[24] codec_tag=0x18424752 width=100 @@ -574,12 +574,12 @@ level=-99 timecode=N/A id=N/A r_frame_rate=25/1 -avg_frame_rate=0/0 -time_base=1/25 +avg_frame_rate=25/1 +time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=299 -duration=11.960000 +duration_ts=612268 +duration=11.958359 bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -603,9 +603,9 @@ filename=tests/data/ffprobe-test.nut nb_streams=3 format_name=nut start_time=0.000000 -duration=11.960000 -size=1054699 -bit_rate=705484 +duration=11.958367 +size=1054727 +bit_rate=705599 [format.tags] title=ffprobe test file diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index beaff81ce2..286e8ee4f4 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -11,7 +11,7 @@ "duration": 1024, "duration_time": "0.023220", "size": "2048", - "pos": "477", + "pos": "487", "flags": "K" }, { @@ -24,7 +24,7 @@ "pkt_dts_time": "0.000000", "pkt_duration": 1024, "pkt_duration_time": "0.023220", - "pkt_pos": "477", + "pkt_pos": "487", "sample_fmt": "s16", "nb_samples": 1024, "channels": 1 @@ -37,10 +37,10 @@ "pts_time": "0.000000", "dts": 0, "dts_time": "0.000000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "230400", - "pos": "2552", + "pos": "2562", "flags": "K" }, { @@ -51,9 +51,9 @@ "pkt_pts_time": "0.000000", "pkt_dts": 0, "pkt_dts_time": "0.000000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "2552", + "pkt_pos": "2562", "width": 320, "height": 240, "pix_fmt": "rgb24", @@ -74,10 +74,10 @@ "pts_time": "0.000000", "dts": 0, "dts_time": "0.000000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "30000", - "pos": "232973", + "pos": "232983", "flags": "K" }, { @@ -88,9 +88,9 @@ "pkt_pts_time": "0.000000", "pkt_dts": 0, "pkt_dts_time": "0.000000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "232973", + "pkt_pos": "232983", "width": 100, "height": 100, "pix_fmt": "rgb24", @@ -114,7 +114,7 @@ "duration": 1024, "duration_time": "0.023220", "size": "2048", - "pos": "262978", + "pos": "262988", "flags": "K" }, { @@ -127,7 +127,7 @@ "pkt_dts_time": "0.023220", "pkt_duration": 1024, "pkt_duration_time": "0.023220", - "pkt_pos": "262978", + "pkt_pos": "262988", "sample_fmt": "s16", "nb_samples": 1024, "channels": 1 @@ -136,27 +136,27 @@ "type": "packet", "codec_type": "video", "stream_index": 1, - "pts": 1, + "pts": 2048, "pts_time": "0.040000", - "dts": 1, + "dts": 2048, "dts_time": "0.040000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "230400", - "pos": "265054", + "pos": "265066", "flags": "K" }, { "type": "frame", "media_type": "video", "key_frame": 1, - "pkt_pts": 1, + "pkt_pts": 2048, "pkt_pts_time": "0.040000", - "pkt_dts": 1, + "pkt_dts": 2048, "pkt_dts_time": "0.040000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "265054", + "pkt_pos": "265066", "width": 320, "height": 240, "pix_fmt": "rgb24", @@ -173,27 +173,27 @@ "type": "packet", "codec_type": "video", "stream_index": 2, - "pts": 1, + "pts": 2048, "pts_time": "0.040000", - "dts": 1, + "dts": 2048, "dts_time": "0.040000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "30000", - "pos": "495476", + "pos": "495490", "flags": "K" }, { "type": "frame", "media_type": "video", "key_frame": 1, - "pkt_pts": 1, + "pkt_pts": 2048, "pkt_pts_time": "0.040000", - "pkt_dts": 1, + "pkt_dts": 2048, "pkt_dts_time": "0.040000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "495476", + "pkt_pos": "495490", "width": 100, "height": 100, "pix_fmt": "rgb24", @@ -217,7 +217,7 @@ "duration": 1024, "duration_time": "0.023220", "size": "2048", - "pos": "525481", + "pos": "525495", "flags": "K" }, { @@ -230,7 +230,7 @@ "pkt_dts_time": "0.046440", "pkt_duration": 1024, "pkt_duration_time": "0.023220", - "pkt_pos": "525481", + "pkt_pos": "525495", "sample_fmt": "s16", "nb_samples": 1024, "channels": 1 @@ -246,7 +246,7 @@ "duration": 1024, "duration_time": "0.023220", "size": "2048", - "pos": "527552", + "pos": "527566", "flags": "K" }, { @@ -259,7 +259,7 @@ "pkt_dts_time": "0.069660", "pkt_duration": 1024, "pkt_duration_time": "0.023220", - "pkt_pos": "527552", + "pkt_pos": "527566", "sample_fmt": "s16", "nb_samples": 1024, "channels": 1 @@ -268,27 +268,27 @@ "type": "packet", "codec_type": "video", "stream_index": 1, - "pts": 2, + "pts": 4096, "pts_time": "0.080000", - "dts": 2, + "dts": 4096, "dts_time": "0.080000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "230400", - "pos": "529628", + "pos": "529644", "flags": "K" }, { "type": "frame", "media_type": "video", "key_frame": 1, - "pkt_pts": 2, + "pkt_pts": 4096, "pkt_pts_time": "0.080000", - "pkt_dts": 2, + "pkt_dts": 4096, "pkt_dts_time": "0.080000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "529628", + "pkt_pos": "529644", "width": 320, "height": 240, "pix_fmt": "rgb24", @@ -305,27 +305,27 @@ "type": "packet", "codec_type": "video", "stream_index": 2, - "pts": 2, + "pts": 4096, "pts_time": "0.080000", - "dts": 2, + "dts": 4096, "dts_time": "0.080000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "30000", - "pos": "760050", + "pos": "760068", "flags": "K" }, { "type": "frame", "media_type": "video", "key_frame": 1, - "pkt_pts": 2, + "pkt_pts": 4096, "pkt_pts_time": "0.080000", - "pkt_dts": 2, + "pkt_dts": 4096, "pkt_dts_time": "0.080000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "760050", + "pkt_pos": "760068", "width": 100, "height": 100, "pix_fmt": "rgb24", @@ -349,7 +349,7 @@ "duration": 1024, "duration_time": "0.023220", "size": "2048", - "pos": "790055", + "pos": "790073", "flags": "K" }, { @@ -362,7 +362,7 @@ "pkt_dts_time": "0.092880", "pkt_duration": 1024, "pkt_duration_time": "0.023220", - "pkt_pos": "790055", + "pkt_pos": "790073", "sample_fmt": "s16", "nb_samples": 1024, "channels": 1 @@ -378,7 +378,7 @@ "duration": 1024, "duration_time": "0.023220", "size": "2048", - "pos": "792126", + "pos": "792144", "flags": "K" }, { @@ -391,7 +391,7 @@ "pkt_dts_time": "0.116100", "pkt_duration": 1024, "pkt_duration_time": "0.023220", - "pkt_pos": "792126", + "pkt_pos": "792144", "sample_fmt": "s16", "nb_samples": 1024, "channels": 1 @@ -400,27 +400,27 @@ "type": "packet", "codec_type": "video", "stream_index": 1, - "pts": 3, + "pts": 6144, "pts_time": "0.120000", - "dts": 3, + "dts": 6144, "dts_time": "0.120000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "230400", - "pos": "794202", + "pos": "794222", "flags": "K" }, { "type": "frame", "media_type": "video", "key_frame": 1, - "pkt_pts": 3, + "pkt_pts": 6144, "pkt_pts_time": "0.120000", - "pkt_dts": 3, + "pkt_dts": 6144, "pkt_dts_time": "0.120000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "794202", + "pkt_pos": "794222", "width": 320, "height": 240, "pix_fmt": "rgb24", @@ -437,27 +437,27 @@ "type": "packet", "codec_type": "video", "stream_index": 2, - "pts": 3, + "pts": 6144, "pts_time": "0.120000", - "dts": 3, + "dts": 6144, "dts_time": "0.120000", - "duration": 1, + "duration": 2048, "duration_time": "0.040000", "size": "30000", - "pos": "1024624", + "pos": "1024646", "flags": "K" }, { "type": "frame", "media_type": "video", "key_frame": 1, - "pkt_pts": 3, + "pkt_pts": 6144, "pkt_pts_time": "0.120000", - "pkt_dts": 3, + "pkt_dts": 6144, "pkt_dts_time": "0.120000", - "pkt_duration": 1, + "pkt_duration": 2048, "pkt_duration_time": "0.040000", - "pkt_pos": "1024624", + "pkt_pos": "1024646", "width": 100, "height": 100, "pix_fmt": "rgb24", @@ -488,8 +488,8 @@ "time_base": "1/44100", "start_pts": 0, "start_time": "0.000000", - "duration_ts": 527350, - "duration": "11.958050", + "duration_ts": 527364, + "duration": "11.958367", "bit_rate": "705600", "nb_read_frames": "6", "nb_read_packets": "6", @@ -511,7 +511,7 @@ "index": 1, "codec_name": "rawvideo", "codec_type": "video", - "codec_time_base": "1/25", + "codec_time_base": "1/51200", "codec_tag_string": "RGB[24]", "codec_tag": "0x18424752", "width": 320, @@ -522,12 +522,12 @@ "pix_fmt": "rgb24", "level": -99, "r_frame_rate": "25/1", - "avg_frame_rate": "0/0", - "time_base": "1/25", + "avg_frame_rate": "25/1", + "time_base": "1/51200", "start_pts": 0, "start_time": "0.000000", - "duration_ts": 299, - "duration": "11.960000", + "duration_ts": 612268, + "duration": "11.958359", "nb_read_frames": "4", "nb_read_packets": "4", "disposition": { @@ -548,7 +548,7 @@ "index": 2, "codec_name": "rawvideo", "codec_type": "video", - "codec_time_base": "1/25", + "codec_time_base": "1/51200", "codec_tag_string": "RGB[24]", "codec_tag": "0x18424752", "width": 100, @@ -559,12 +559,12 @@ "pix_fmt": "rgb24", "level": -99, "r_frame_rate": "25/1", - "avg_frame_rate": "0/0", - "time_base": "1/25", + "avg_frame_rate": "25/1", + "time_base": "1/51200", "start_pts": 0, "start_time": "0.000000", - "duration_ts": 299, - "duration": "11.960000", + "duration_ts": 612268, + "duration": "11.958359", "nb_read_frames": "4", "nb_read_packets": "4", "disposition": { @@ -587,9 +587,9 @@ "nb_streams": 3, "format_name": "nut", "start_time": "0.000000", - "duration": "11.960000", - "size": "1054699", - "bit_rate": "705484", + "duration": "11.958367", + "size": "1054727", + "bit_rate": "705599", "tags": { "title": "ffprobe test file", "comment": "'A comment with CSV, XML & JSON special chars': <tag value=\"x\">", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 1b7e08844b..e7e61a5d05 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -1,49 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> <ffprobe> <packets_and_frames> - <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="477" 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="477" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1" duration_time="0.040000" size="230400" pos="2552" 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="1" pkt_duration_time="0.040000" pkt_pos="2552" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1" duration_time="0.040000" size="30000" pos="232973" 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="1" pkt_duration_time="0.040000" pkt_pos="232973" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="262978" 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="262978" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="1" pts_time="0.040000" dts="1" dts_time="0.040000" duration="1" duration_time="0.040000" size="230400" pos="265054" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="1" pkt_pts_time="0.040000" pkt_dts="1" pkt_dts_time="0.040000" pkt_duration="1" pkt_duration_time="0.040000" pkt_pos="265054" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="video" stream_index="2" pts="1" pts_time="0.040000" dts="1" dts_time="0.040000" duration="1" duration_time="0.040000" size="30000" pos="495476" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="1" pkt_pts_time="0.040000" pkt_dts="1" pkt_dts_time="0.040000" pkt_duration="1" pkt_duration_time="0.040000" pkt_pos="495476" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525481" 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="525481" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527552" 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="527552" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="2" pts_time="0.080000" dts="2" dts_time="0.080000" duration="1" duration_time="0.040000" size="230400" pos="529628" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="2" pkt_pts_time="0.080000" pkt_dts="2" pkt_dts_time="0.080000" pkt_duration="1" pkt_duration_time="0.040000" pkt_pos="529628" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="video" stream_index="2" pts="2" pts_time="0.080000" dts="2" dts_time="0.080000" duration="1" duration_time="0.040000" size="30000" pos="760050" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="2" pkt_pts_time="0.080000" pkt_dts="2" pkt_dts_time="0.080000" pkt_duration="1" pkt_duration_time="0.040000" pkt_pos="760050" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790055" 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="790055" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792126" 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="792126" sample_fmt="s16" nb_samples="1024" channels="1"/> - <packet codec_type="video" stream_index="1" pts="3" pts_time="0.120000" dts="3" dts_time="0.120000" duration="1" duration_time="0.040000" size="230400" pos="794202" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="3" pkt_pts_time="0.120000" pkt_dts="3" pkt_dts_time="0.120000" pkt_duration="1" pkt_duration_time="0.040000" pkt_pos="794202" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> - <packet codec_type="video" stream_index="2" pts="3" pts_time="0.120000" dts="3" dts_time="0.120000" duration="1" duration_time="0.040000" size="30000" pos="1024624" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="3" pkt_pts_time="0.120000" pkt_dts="3" pkt_dts_time="0.120000" pkt_duration="1" pkt_duration_time="0.040000" pkt_pos="1024624" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="487" flags="K"/> + <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="487" sample_fmt="s16" nb_samples="1024" channels="1"/> + <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2562" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2562" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="232983" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="232983" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="262988" flags="K"/> + <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="262988" sample_fmt="s16" nb_samples="1024" channels="1"/> + <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265066" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265066" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495490" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495490" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525495" flags="K"/> + <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525495" sample_fmt="s16" nb_samples="1024" channels="1"/> + <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527566" flags="K"/> + <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527566" sample_fmt="s16" nb_samples="1024" channels="1"/> + <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529644" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529644" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760068" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760068" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790073" flags="K"/> + <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790073" sample_fmt="s16" nb_samples="1024" channels="1"/> + <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792144" flags="K"/> + <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792144" sample_fmt="s16" nb_samples="1024" channels="1"/> + <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794222" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794222" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> + <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024646" flags="K"/> + <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024646" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0" reference="0"/> </packets_and_frames> <streams> - <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="[1][0][0][0]" codec_tag="0x0001" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" duration_ts="527350" duration="11.958050" bit_rate="705600" nb_read_frames="6" nb_read_packets="6"> + <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="[1][0][0][0]" codec_tag="0x0001" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" duration_ts="527364" duration="11.958367" bit_rate="705600" nb_read_frames="6" nb_read_packets="6"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> </stream> - <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="0/0" time_base="1/25" start_pts="0" start_time="0.000000" duration_ts="299" duration="11.960000" nb_read_frames="4" nb_read_packets="4"> + <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612268" duration="11.958359" nb_read_frames="4" nb_read_packets="4"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> </stream> - <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="0/0" time_base="1/25" start_pts="0" start_time="0.000000" duration_ts="299" duration="11.960000" nb_read_frames="4" nb_read_packets="4"> + <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612268" duration="11.958359" nb_read_frames="4" nb_read_packets="4"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> </stream> </streams> - <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" start_time="0.000000" duration="11.960000" size="1054699" bit_rate="705484"> + <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" start_time="0.000000" duration="11.958367" size="1054727" bit_rate="705599"> <tag key="title" value="ffprobe test file"/> <tag key="comment" value="'A comment with CSV, XML & JSON special chars': <tag value="x">"/> <tag key="comment2" value="I ♥ Üñîçød€"/> diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut index 5e5df36c53..72e59e8cf6 100644 --- a/tests/ref/lavf/nut +++ b/tests/ref/lavf/nut @@ -1,3 +1,3 @@ -3698d68a629551fca24a6e6af4f07585 *./tests/data/lavf/lavf.nut -319860 ./tests/data/lavf/lavf.nut -./tests/data/lavf/lavf.nut CRC=0x3667030f +56c403dd91ae1dd4569348381b2b43a4 *./tests/data/lavf/lavf.nut +319902 ./tests/data/lavf/lavf.nut +./tests/data/lavf/lavf.nut CRC=0x4780846b diff --git a/tests/ref/lavfi/alphaextract_rgb b/tests/ref/lavfi/alphaextract_rgb index dcad785596..d46b563f73 100644 --- a/tests/ref/lavfi/alphaextract_rgb +++ b/tests/ref/lavfi/alphaextract_rgb @@ -1 +1 @@ -alphaextract_rgb 193a965bfc9bdab8a873b3e10c393c45 +alphaextract_rgb 4a46df014912056534fcab2f45a02279 diff --git a/tests/ref/lavfi/alphaextract_yuv b/tests/ref/lavfi/alphaextract_yuv index 225e763b3e..32b9ab9a85 100644 --- a/tests/ref/lavfi/alphaextract_yuv +++ b/tests/ref/lavfi/alphaextract_yuv @@ -1 +1 @@ -alphaextract_yuv 527f7432973bec34b79b3774802dfc46 +alphaextract_yuv 591e2d45f96ecfa8cc326eb741456a79 diff --git a/tests/ref/lavfi/alphamerge_rgb b/tests/ref/lavfi/alphamerge_rgb index d49f4ff92c..d890fae2db 100644 --- a/tests/ref/lavfi/alphamerge_rgb +++ b/tests/ref/lavfi/alphamerge_rgb @@ -1 +1 @@ -alphamerge_rgb 193a965bfc9bdab8a873b3e10c393c45 +alphamerge_rgb 4a46df014912056534fcab2f45a02279 diff --git a/tests/ref/lavfi/alphamerge_yuv b/tests/ref/lavfi/alphamerge_yuv index 59556be01f..2e5830199e 100644 --- a/tests/ref/lavfi/alphamerge_yuv +++ b/tests/ref/lavfi/alphamerge_yuv @@ -1 +1 @@ -alphamerge_yuv 527f7432973bec34b79b3774802dfc46 +alphamerge_yuv 591e2d45f96ecfa8cc326eb741456a79 diff --git a/tests/ref/lavfi/colormatrix1 b/tests/ref/lavfi/colormatrix1 index 1414850fec..9ec093d90a 100644 --- a/tests/ref/lavfi/colormatrix1 +++ b/tests/ref/lavfi/colormatrix1 @@ -1 +1 @@ -colormatrix1 62712b752005e914f61c0ca0e5bad3d8 +colormatrix1 600fef16b66cff4ee76540ff2a8f4480 diff --git a/tests/ref/lavfi/colormatrix2 b/tests/ref/lavfi/colormatrix2 index b6eb5b08fb..9961bae4e5 100644 --- a/tests/ref/lavfi/colormatrix2 +++ b/tests/ref/lavfi/colormatrix2 @@ -1 +1 @@ -colormatrix2 e878a75c03b8ef793daee5f4ca24c2d1 +colormatrix2 e4ba95b7dd5e0862aa5f5e3ddc54bda4 diff --git a/tests/ref/lavfi/crop b/tests/ref/lavfi/crop index 50e0ea3c73..dec7f29a88 100644 --- a/tests/ref/lavfi/crop +++ b/tests/ref/lavfi/crop @@ -1 +1 @@ -crop 5b962079118f8502a01317c98c6b25a5 +crop f7b5236ddf88224188051c7c43503a14 diff --git a/tests/ref/lavfi/crop_scale b/tests/ref/lavfi/crop_scale index c0fcb44983..e692a8a1a7 100644 --- a/tests/ref/lavfi/crop_scale +++ b/tests/ref/lavfi/crop_scale @@ -1 +1 @@ -crop_scale 32e723fa9503d4ce8173aa999bdb3b1c +crop_scale c298d61e731a97d0a9600e7fde80b6b4 diff --git a/tests/ref/lavfi/crop_scale_vflip b/tests/ref/lavfi/crop_scale_vflip index 5e5146ef91..a1cc0e933d 100644 --- a/tests/ref/lavfi/crop_scale_vflip +++ b/tests/ref/lavfi/crop_scale_vflip @@ -1 +1 @@ -crop_scale_vflip 9300146187e73d5eab965dc379d92a65 +crop_scale_vflip b2760ee11238873d6321d0a11cd42d0e diff --git a/tests/ref/lavfi/crop_vflip b/tests/ref/lavfi/crop_vflip index 2dfabfbe97..d6d6bade63 100644 --- a/tests/ref/lavfi/crop_vflip +++ b/tests/ref/lavfi/crop_vflip @@ -1 +1 @@ -crop_vflip 07f397369c8772f4040045d35e16ca03 +crop_vflip 8368eb12fa29acc5826bade961257375 diff --git a/tests/ref/lavfi/drawbox b/tests/ref/lavfi/drawbox index ddb8d86006..6d2f6324a2 100644 --- a/tests/ref/lavfi/drawbox +++ b/tests/ref/lavfi/drawbox @@ -1 +1 @@ -drawbox 39a2f4efd35f77872b647126f700d37b +drawbox b6ff6ecda5611de46ed26db05b49dc72 diff --git a/tests/ref/lavfi/edgedetect b/tests/ref/lavfi/edgedetect index f6130cb9d8..6db0e72aba 100644 --- a/tests/ref/lavfi/edgedetect +++ b/tests/ref/lavfi/edgedetect @@ -1 +1 @@ -edgedetect 666945146078e8e34bba6264776025de +edgedetect 9d396de52d56b63a77ea6933a323f61f diff --git a/tests/ref/lavfi/fade b/tests/ref/lavfi/fade index 3a9a703226..852abb920e 100644 --- a/tests/ref/lavfi/fade +++ b/tests/ref/lavfi/fade @@ -1 +1 @@ -fade abead3454d2e9adec67d7b237f69b5a1 +fade 129fb9b266524b0adf102689c366cac8 diff --git a/tests/ref/lavfi/life b/tests/ref/lavfi/life index cb11a80f06..05713f3a7c 100644 --- a/tests/ref/lavfi/life +++ b/tests/ref/lavfi/life @@ -1 +1 @@ -life db5aa52dabd45eb2b18b3e643828b9bb +life bc4822aa5d473a8b5efb31fef7aeac86 diff --git a/tests/ref/lavfi/null b/tests/ref/lavfi/null index fae96c6fe3..0b9b9b86ac 100644 --- a/tests/ref/lavfi/null +++ b/tests/ref/lavfi/null @@ -1 +1 @@ -null 3b9efd4c33f3085a50a51dfbc5a4a5d1 +null 61fffd2d8425759a33ae07e718d0242d diff --git a/tests/ref/lavfi/overlay b/tests/ref/lavfi/overlay index 50ad4a8869..ca70370a02 100644 --- a/tests/ref/lavfi/overlay +++ b/tests/ref/lavfi/overlay @@ -1 +1 @@ -overlay 4f3c972b857edc6eb07c0f9808161cc1 +overlay 4e85d551db9e56e8faddc1fc70fd6a00 diff --git a/tests/ref/lavfi/pad b/tests/ref/lavfi/pad index 6178533fcb..7a6f61e4ee 100644 --- a/tests/ref/lavfi/pad +++ b/tests/ref/lavfi/pad @@ -1 +1 @@ -pad 7f5d7584d68690cd17fa48addd4b1341 +pad 8122d716097523d0875e2d55b0926105 diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 6bfc1e709a..042f2d5518 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -1,83 +1,83 @@ -0bgr af0cdbd9c5e606f6826feda281021306 -0rgb e9bd85dae7f90b7a8c59c5234012a195 -abgr df72ca35d31621dfb793a68e3a058c0e -argb e798ab12f3aeb454ada73dff71a03fcc -bgr0 e245a3145edb3fbc26ae3c45738521cb -bgr24 2100f953dea4ef10eb1b51bdc913733e -bgr444be 9ac705d6b376e54179e7270e22121e69 -bgr444le c4db6c469f211819d304afdbbf344900 -bgr48be 52336c5ad4b1229bdb34ea42226144f7 -bgr48le d3f1f46e272e7c7725fc1d482f3687b7 -bgr4_byte 055b8d527f17497d5245fc1347b4cd70 -bgr555be f7f31cda9df45bd5f63c76fb0162426d -bgr555le 0093d7a253686eb79f579bc24962187f -bgr565be 53ac20cff64a4141b163640b143f74cf -bgr565le b29700c5b1300db3ab2e0e9af5bc2688 -bgr8 5eb0bbd04c4f484a8b334d94304ea7de -bgra cdea0a048183daf1aa71cb1226347270 -gray fd2289b835017587db913c38060bff53 -gray16be d681ecf7b10b50d074866a3c10fc79fc -gray16le d043ab55f76282cbabef7c8af2cb0cee -monob 2065fd7c9ab96979b969678ddf62656c -monow b143abb40550d66f4730e8eb5318e1cb -nv12 e25d6330c5474e3cf3ae3c3166c347f3 -nv21 27a634b83bb84ef857c5e1e55f6319a1 -pal8 0d9a7cb823d158890add60c1e00fbbd4 -rgb0 34b97a7607d34794cfe1bc9945b3b6d7 -rgb24 bd3cd61dd250a2140939c876cd0eec58 -rgb444be 1e3baed4723a7011bc1457ccccaa2806 -rgb444le 7d7a857d60eb8bb2ed8088afefa22f45 -rgb48be 3d0a72dc5e82241b4bc39341232e9be7 -rgb48le a933caeab470831b5e55145bb2e9baf2 -rgb4_byte b9948106ff030f658840cc220480953c -rgb555be 61986143c7372711ebb86ef1ea026519 -rgb555le aab038e44ac91e4e91390109d38abd54 -rgb565be 4e25ac845c96519ae34e077630778a73 -rgb565le 7285fefdd0d2486e99c1dc1b0c6f31f5 -rgb8 68b1cefad048a7d36b2a6123daa460f9 -rgba efef1ef98681bb79723f3b4d10bd27a1 -uyvy422 344794c8fbbfbd906ac0d5a5514cd78f -yuv410p 1e8c3156dc963dcb079688b430b1c0b0 -yuv411p 2737ad48cd2285fb133e9be1f9a9cf28 -yuv420p 3b9efd4c33f3085a50a51dfbc5a4a5d1 -yuv420p10be f93b411b661272389aff40fb6c411ea4 -yuv420p10le 6807cf71a20c8b37331f85b49e83deef -yuv420p12be 0d8b314b9831a008d9fa6b918f0f4747 -yuv420p12le 8762d6d306e225099bcc7955246abc0b -yuv420p14be 88772ae6715fbb5a2730d2d0ac3c30e6 -yuv420p14le abee7a9aa16dbcf257ac802d6ee3c770 -yuv420p16be 4883d2fc25e199dfef01d0131a5486d2 -yuv420p16le cff6975103082259414224f0721125ba -yuv420p9be 37df84a076eac4a1c8fe6c53e4684f9a -yuv420p9le 02e91e484f14af32ab7ca0b5c1f8e2f5 -yuv422p 25f74db9daefb5dba7de622c741998d0 -yuv422p10be dae7945ccd81810e52dc338984e8b868 -yuv422p10le c934050fd37931740c67756f51ce9018 -yuv422p12be 9d8cd9d80575bb7d66c9405e4125b6aa -yuv422p12le 26c433074422d16e4dd3af40e4f68b4e -yuv422p14be 76527aede5a9cba9bf77038e132fe445 -yuv422p14le 57062d9c84afad541192ad0b7edb04a8 -yuv422p16be cdb6bdaf0aab1b2108c485cac2270180 -yuv422p16le 6405652cceab04406e0da4d9fbed6142 -yuv422p9be c0ef13d609e0b6f04c55cf6f2a8264e7 -yuv422p9le b5d3fcf6503355ebb1f424cc43c037a9 -yuv440p 7e1bc3dade41c9c05b4edf112c1ee4cc -yuv444p 7fc0b7e65748d4f7744107d26ebe06f2 -yuv444p10be 82a8fda7281ccda727cd6b25da0e219b -yuv444p10le f5954f6dde3e09c83d9321f0b84f5275 -yuv444p12be 80c416697b0b006228019d6ea3c13257 -yuv444p12le 95eef7a4245229cb488141d83ea46df9 -yuv444p14be 71c4146d88c9cd27a4ba669d2869dedc -yuv444p14le 04f25ade3a02022997ed3f8469f126a8 -yuv444p16be 941710611d7bb3828163979eaa4cfe35 -yuv444p16le 1896fd04ff664052ae74dfcb33ed13b5 -yuv444p9be 23ffab586f4fdd7b63604d782ec3291c -yuv444p9le db9137c4c96f892cb6d49c24d00b6e31 -yuva420p d3c91b0a968b248b24628cf0be7f82fc -yuva422p 062631b545bb922765045fbb6ad48d36 -yuva444p 294a3b99740a2b8f69c5f362a64b0ac1 -yuvj420p 0fccd4e9d15fd1e801b5f615cc66d7f2 -yuvj422p 659cf6f0caba0cfeaf3f471c4def8945 -yuvj440p 3af38ae458bcf7a32f7e7a3c0f012018 -yuvj444p 64c0788c6fb2ec4f5ac12918d3ec756f -yuyv422 66a8ac11d5a512f3f16c2a823f3d396a +0bgr a06d3a7652e4885c65895e0e168aab28 +0rgb b6b5653d2228cdf2ba3c55a72f2e713f +abgr 1a147fa04ed70b9a7e67a4c89052f630 +argb 997df0b5c268a0d8f9c611cae4e01e05 +bgr0 218df6dc3eb5094a0c16a8bd18bc3999 +bgr24 d6370f6dc34df2ea66e1718baf74137b +bgr444be aba6dfea008ae12c2120a95f54293904 +bgr444le cfb5401e8f076cc8675e17ed1114a3df +bgr48be ab65229b64606f6408cd732b967c0b01 +bgr48le f1b4e718cadee9bd2978289153ce43de +bgr4_byte de96505ef9ad7078f87b4dfdf6fe4b61 +bgr555be 8d5de9e9200d622f27dc73958a85045c +bgr555le 74eb9837706143a40e26305a16a79369 +bgr565be 13a36d6502be88fc0c2aec05b8d2d501 +bgr565le ed027571692aecd522aa65a90cc7e09b +bgr8 71ef789609c746c2e7e4be9dec29062c +bgra 0364b074268682ea46168742a8239f7d +gray 1e5e2b8548843a6898eedd9c974c422c +gray16be 389f4e5a8ab413b3af32767b59ed7f9e +gray16le a1f912941247e45b394b9cf4f0e81130 +monob 309b5785a36bd988d17e15d88f4ffad1 +monow 8809a02bc69b58d1114b09ca79ebffad +nv12 75e90c54d858b993e99f4ee6d2a2a38f +nv21 8831a3f411015d45fbc5dd191245ba9c +pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 +rgb0 992f5ad24802cc255edab45c3084db4a +rgb24 c71ba90f69f15c8275232bb3f62d0ced +rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 +rgb444le 5f29863553107110ea817f52151d77b7 +rgb48be a3bc81c46c21818a989f23104a599ab0 +rgb48le e87c661ac49aea1f1e93939802883d92 +rgb4_byte 293b1b84f01efd90bde40cb3faffc127 +rgb555be 5229183fa64d4e5c7e3703d8263ee6ae +rgb555le c3e9978cb2a4129a5575935e8cbc433a +rgb565be bc123b962629ead1a06af0c18cbb6e5f +rgb565le 20757fafe4756e62d845b2ab4c0b8f93 +rgb8 e01614f5416dcc8ad365ad7a57afc9fb +rgba 53796fa4c392a1b2659595b6a284f8c4 +uyvy422 3f411f947e3ac8f842c88e717d68bd9a +yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db +yuv411p 9461b188dab6f8b90d9a27e353a89f58 +yuv420p 61fffd2d8425759a33ae07e718d0242d +yuv420p10be 2abf90242cb021cb6fcf9f2c3c92f6a7 +yuv420p10le 180b7e4de684c7225d2fb37614f842cb +yuv420p12be 256c9e6cfc878a8abf681b30777c0620 +yuv420p12le 8dc8b86c4790da3769d4a62e87608623 +yuv420p14be 8d22756c5d2b9e501924c082bfb22a6c +yuv420p14le c9da19d4818bcb119ad6481b75778f7e +yuv420p16be 4ccdcca6dd6a960f9a3333f0aee095bd +yuv420p16le 9c5847d9b0de258a10ee906dc47e24ea +yuv420p9be fa7ad4f73232aac0e35def62af1e2c39 +yuv420p9le 3720ba1786b56c8f4913e67dddebbb07 +yuv422p eee223e92f1f2e5ad4186b411ebf5816 +yuv422p10be 80fa87750491dcc3e93d175b64835654 +yuv422p10le e1640cd315bd96c6b59f7753825a7306 +yuv422p12be 8a17ae3a5f565479ec4aa230ef78a6fa +yuv422p12le 04215506e2eca5b79f47e322a5949a58 +yuv422p14be 0fec4a6615ff610e3ea5e85acbd1b273 +yuv422p14le a54c6121c1cb713a33961ea0faa35956 +yuv422p16be 1f3c216927d17966a009a42def124bba +yuv422p16le 90adbdffaeea9b09398339c8a1322b02 +yuv422p9be e46446534dd0821029d3b831c9c1d1b0 +yuv422p9le 520e418a2429f7efee511b7fcbf45ab6 +yuv440p 456d83524b299f2fa1bb988e421554d9 +yuv444p 068bc09d282d18c9fa35c2787943fc2a +yuv444p10be 9f6e1490080a454243daee9229425e1e +yuv444p10le cc183e51041351d9ac06c4df6e8ad5f7 +yuv444p12be df420773bb3cca2ffb585db3bbe01195 +yuv444p12le 25c0c73d98c3c1e281044d79097608f5 +yuv444p14be 516b18e8331e7d404c7541bafc5501e6 +yuv444p14le 7c88d9a233979d73762cffef2fe08306 +yuv444p16be 4000b12fa88ed0feef182da31c7e6b96 +yuv444p16le 96a857dba8dc6792c58daec872825b32 +yuv444p9be 07727e5c9040b7f0a17d591288ac330d +yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 +yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuvj420p 73661456012f20cda81207b14bb0c0a5 +yuvj422p aa97862b57f47c5a6506156e9aaf129a +yuvj440p ff8b9884a49d546b035f5d2ac1e673df +yuvj444p b8142888d80b8065c54045839e79b331 +yuyv422 f06a4fbbdb32807d05de825daa2c3a1b diff --git a/tests/ref/lavfi/pixfmts_crop b/tests/ref/lavfi/pixfmts_crop index 00dcd8c16a..797aedcf73 100644 --- a/tests/ref/lavfi/pixfmts_crop +++ b/tests/ref/lavfi/pixfmts_crop @@ -1,43 +1,43 @@ -abgr c6f57b04f31e489132a7bcb8420b6435 -argb 4f46788968406fd1b994cbc254339bc2 -bgr24 44642a510b79d7469e6c841c8aa44b36 -bgr48be f3026fb3b5b032f0adc875d228f6e912 -bgr48le 827c0a1db92f60c0465ecfaa565ef3eb -bgr4_byte 626742ff4a54a09a2b35cd570005f55d -bgr555be 22a6ed3d9701f07ede3a2a1ec550b059 -bgr555le 62182cc3ab5b00383f0037b7451cd0a8 -bgr565be 6f3c1c7cfa627c390703f5e95f3d565e -bgr565le 1792f375b27c14f784f6fadf11eeecb5 -bgr8 12c3f9e99d99b2b2029f92b4b64cbf26 -bgra 76936dd2040b11ad7b5dc8dc9df646ac -gray 6f715d8f91641e94de9f22e429860e3c -gray16be 1e62313c7f6fc1589e030a6b93e4a50d -gray16le bf5c435d0ca9ae8392515217140a1359 -pal8 63057406ffc96a66e0bddad780423f00 -rgb24 ac8cb6c52c363255b656478752af5a8c -rgb48be dd1c8240dd8b49170c8071f9f4ca0500 -rgb48le c07b785814c5a221681e708a3c38d4d7 -rgb4_byte cf5c2cd6999b38cd56914d8b7aab01df -rgb555be f6c3e63759151e75c25f894342304838 -rgb555le 8f10e82ffa8c320dbfba30235a7c0a4e -rgb565be 2633ad5d0d9f089013d1cd0cd07a807f -rgb565le c548a251c2160ae0343eef2f9d43d542 -rgb8 0d930f27b1f03677ad50b81130cbda07 -rgba 5d75f664aa12412dcd9f1294f8e86ae9 -yuv410p 60da6d88064127f15978209a0747a7a7 -yuv411p 35f303de0bc4c506e89d8aecd97c7b76 -yuv420p e9b0e2c2873acfc2cc5c3ddb16d4c698 -yuv420p16be 29883026ef41971c8cab09dea5a59819 -yuv420p16le 5150a03ac0268c04df9fd79d1848c7c0 -yuv422p 6677f38dda4e6f442b8fdccfe04ada1d -yuv422p16be 9e7bfac176ba8c61505031249382b4b2 -yuv422p16le 4a9863b33b7b79f05acaa1d5de17ed3a -yuv440p c815ac65ed316fc273053684eee34f5c -yuv444p b86691ac54a6059cb68a142005365aa9 -yuv444p16be e3c0d57ae0fe658aee831abc1a34a279 -yuv444p16le f774853c8bc5369b2ed27fba3a98b06f -yuva420p fe94527c46de2153dea7e3a9c8690110 -yuvj420p 2f1c3ad073638a72587c1cf2c82cd684 -yuvj422p 7a246902938fce0c4bc89ca1f958fa81 -yuvj440p 19b1b0fbef3ab21939a43524fbdf946b -yuvj444p 3ea1dd23e50be7efd76e394d72dad5cf +abgr ef31d9057f6e65a7c3308a1b1daa98fa +argb 5e5e261c4870e0de05d56ff640b9550a +bgr24 44bec15f35513de7e957b3d59b53cb7b +bgr48be 0b5ebce3c48eb8614d79e204b5268603 +bgr48le c4ab61a8b9d502132730c6abb6ffd84c +bgr4_byte cab930dbe1fe77d58b41837ecdcb8460 +bgr555be 67162782fdb86813f446d8e1c21c73e9 +bgr555le 85913cfa8dab465f7dcfcfe7f9001a01 +bgr565be ee9a1debb896d41c53a026f9e6ce006b +bgr565le ab7b6055bc3b6b7edc9a5e4de43ec90d +bgr8 f85ff16e21d922ad6d32648ef3acfbfb +bgra 9f2e37d73ad3b759fc9d6b12ee668c38 +gray 3266b99065a17cbd647f2339addc5303 +gray16be 02ac848ad4e28c06938599563ba81ff7 +gray16le 672aebfeb8a0f4067b3c6064340056e4 +pal8 e1fd50b8a8a67fb5abd8b44abc778bbb +rgb24 d044123f1fe50f656f2101dd3f091ead +rgb48be ef5507f88948b54218911d12e1dbef36 +rgb48le 6d045d5990d6ada64a112e3b581a7b38 +rgb4_byte 0f0f9ee31c65dc60da49bf98a1b06dcf +rgb555be 48fa619bfd04f6dee05416b02605c031 +rgb555le 292cff1f824e49076bad50a07ab1c749 +rgb565be 0dd6f6a5a8713bd1c3d9826bb7a88eab +rgb565le 6afd85faa8c6f0f330969539178eb9a2 +rgb8 87cf541b110e35a6f9a983e9cde85e15 +rgba 7abe1af7b97f5b9a7aa5ad3e4bf32f76 +yuv410p 126e0da1da4fd89be28087b8367bbb36 +yuv411p b94f0af107fc4796aca70c0a36d374c5 +yuv420p 74c6b331bd30f005e6c75a192423ad90 +yuv420p16be 2d3c84ebff77479e8c5b6e3e59ec4e45 +yuv420p16le e2c906f2751609bf8cbcbeb2f629319a +yuv422p 124bc8d668072de1bb3b894cc4bae859 +yuv422p16be 3ec47e2709107fcc388b5e0abebf7eaf +yuv422p16le a4183a62917bf8568fe11ff446dd18f9 +yuv440p 15c81c685fa5b9db95150caff14ff83f +yuv444p 12b752f78af72666627cea2d0c274cdb +yuv444p16be f2bf0e22a1d184e37eaa199a76cf22ba +yuv444p16le c11b151dced5c8854d385373fa4dcc8f +yuva420p 920c5d1b965eeb72e3a0e343696face3 +yuvj420p f9183e49f42bae31d7d85b92161fa82f +yuvj422p aabeed60a6e1b2cf88665ac627bf531f +yuvj440p 5ae4f404b42f3167f978473d9a3737fc +yuvj444p 6728997f65b879fd5a3175cb449a8f0c diff --git a/tests/ref/lavfi/pixfmts_hflip b/tests/ref/lavfi/pixfmts_hflip index 87fcd264d9..e696997d2c 100644 --- a/tests/ref/lavfi/pixfmts_hflip +++ b/tests/ref/lavfi/pixfmts_hflip @@ -1,47 +1,47 @@ -abgr b2d21776cb989ebe6bd4bc2b9cd0ca47 -argb 68a19210023e15df0eac0a79e75183aa -bgr24 5ad78e83dc0028f931f798e5f827e295 -bgr444be eef430d7c80a13ec2492febe2bb0f6e0 -bgr444le a89263802f74b384c636897b38a7e606 -bgr48be fcf9040d31c88a7d553d3fed609e3e6e -bgr48le d1afce5faf0affac30a8668fca42460c -bgr4_byte aba8e7dec75db5dd5bab17bef5d46291 -bgr555be 21f05fc1d8553842f5df60d09e5458b4 -bgr555le 3ef5c95248d9e11351d92d4044fa35e5 -bgr565be 5dcd1ce4baac9b71a3a3b18f0af6a809 -bgr565le 3ed5d6c26b5288009c3da6f85d6c0466 -bgr8 f8ca984e121f50e43707f0b97c05235a -bgra c05e9e5d82e123a435c7f04f543e067a -gray ebe00908eaf8960391c42eedf586daf0 -gray16be 9648eaa01d7ac47b094c1311ae4ccd68 -gray16le 2582da19f4debeb4b73ce8180f6d3479 -pal8 111722688c66fb10d671c7bfc88ceff0 -rgb24 b65f8b8435682ac227bd0fb6a2845abb -rgb444be f34e83c7d069e488258bf75f9c2d0091 -rgb444le b1490227611768671a56cbe9baf56ff3 -rgb48be 43a18af66706de67b323fac31a561e81 -rgb48le 7518d1a3b1edfe46c6631370bb109e17 -rgb4_byte 18ff980656cc632d0cfe1c66c065fd24 -rgb555be fa1ac23c15d4179d1b97dcc71ed9e579 -rgb555le 020cee36c7716ff4c2729545308b28d2 -rgb565be 054366874dd65010f486526694a54318 -rgb565le 188289c256551f9befc2afb5c9c1dd19 -rgb8 ab27a8c93fe47baffd4bd867dfcf71d7 -rgba 0b7c2360d4e74dc3f11d617d6cb2c021 -yuv410p b6ccd81ff854b56723e1141c0030be9b -yuv411p 0e74482445a85f55ef86079c9713b4bd -yuv420p 206849fbbb4feaa8395e1ef02bbfc7d6 -yuv420p16be 2279188920084f364db1a1785957b0f0 -yuv420p16le f2d4104bfb5405e8c46d1f79723aaefa -yuv422p a45ef5fde221ce0d0bd37c4b4859954e -yuv422p16be b023e1e64c3bae04328c47669cb121aa -yuv422p16le 51ed3acaa995948835c2a46f8eb00859 -yuv440p 0d0d93e908f8e41b2c5a43895e5fd650 -yuv444p 659a951ba2be3341596081dec6bbd21f -yuv444p16be 14b0e93ea32883031f789b4e1a691f7c -yuv444p16le df92fd636a8201a47f3786f0c53500c1 -yuva420p 22bb7821c3b3030de8fad93cbddff425 -yuvj420p c3a884977ca74149639e7fcf5ede0a1e -yuvj422p 944d8b5dfc4dd82a076a637c56dbc8e8 -yuvj440p df970958d39304b8c31332d456d8c15a -yuvj444p 0c74264e2b6c017b7d0255e963148673 +abgr 8ab842e280c8b31f66450e8951dfedfa +argb cdb6aa47939d49c0ff72537bfc8c82e0 +bgr24 5b64fd60e2050946b50da1f4945127fb +bgr444be b52c1b9d9dc02cb46c04e80d97139e60 +bgr444le 48172797fa65a25c0ad30ddc7e8f5bcb +bgr48be 58e292c33eb60708171c3393a5700615 +bgr48le e1be8e6bfe26acdee258e76329d2f03d +bgr4_byte af34e1158edfbc8c6929365d651a9549 +bgr555be c82d7877f7ef25ee1154d05b240cf54c +bgr555le b7a4e2c66807a82bd132dfcf8540bfb5 +bgr565be 3b464a00c619410eac7bdea9c96faf60 +bgr565le 4b4c708d4ad222f41734dce68e9d48b6 +bgr8 ad1db7a17cdfab2ede6f22c2415a3fbf +bgra 85fa06ad9fd156c3179a647a2e741b60 +gray 35b50e78d5d27255f43e642a404dd708 +gray16be d206a080739d89cb7dc0009ad4082ed4 +gray16le 7ebcfd9401ba85e584230de8fc02986d +pal8 19c8735b23feeed18ec2d37913a5f3f8 +rgb24 c2752464ac2b549268e9638745dba857 +rgb444be 85586541cc7eb12e05ff7162b12304c2 +rgb444le 670da20b82403e00609bf2c1f5611223 +rgb48be a9ee2c9946d8d54dba60cebbdbe43886 +rgb48le 28e2cf59b789249dbd0859f58f4ae55d +rgb4_byte 31dca70b4f3537afa9840cea1b062acf +rgb555be c010cc746ce9483b47387ba846670179 +rgb555le a768de014e0908dfa886108da376b2e5 +rgb565be 6727e71974c8e5dad157925c10ee1532 +rgb565le b0a2b4817775289cfc415bb951f9ae0c +rgb8 22fdbd14ce296c1afa9bb4a6ea09b3fe +rgba a37789c4df73c3bd8648ad1fe9d3f991 +yuv410p a1280c2b9b562dba3c2d35a1e5fc4b23 +yuv411p 6bf10756ac5c7841db63a97106ff911b +yuv420p 45f4a06481f2cd8e28fb29c7c151e110 +yuv420p16be cde798cad650bcb087943442a399c8ea +yuv420p16le b7124c56605eeb12f3d13287ddc77f3a +yuv422p c3982fbb57e796881efedae11b8346de +yuv422p16be 4b96fb571e686185d96b4a97e3413d5f +yuv422p16le 503bc49bace58dae1767173746a16056 +yuv440p 44f78792c5766ab896fbe0d718976946 +yuv444p a36b8ce12de27971b52e93267fe6583f +yuv444p16be 9370058632b2582ab7a21725ec4f4e1d +yuv444p16le 0674c63a0e8debbfc010a2730da66a13 +yuva420p a62cf0a72905b54a7ef10fcaeff723bc +yuvj420p 86370b945c5d19d809ee92386d476a53 +yuvj422p d3bda08bd4b92a256a8ec8432c4767d1 +yuvj440p dbae7083c82f20a38fc55e6f8bc374bc +yuvj444p 55ce75c7bd172b28703e82f64186e6b6 diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 6bfc1e709a..042f2d5518 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -1,83 +1,83 @@ -0bgr af0cdbd9c5e606f6826feda281021306 -0rgb e9bd85dae7f90b7a8c59c5234012a195 -abgr df72ca35d31621dfb793a68e3a058c0e -argb e798ab12f3aeb454ada73dff71a03fcc -bgr0 e245a3145edb3fbc26ae3c45738521cb -bgr24 2100f953dea4ef10eb1b51bdc913733e -bgr444be 9ac705d6b376e54179e7270e22121e69 -bgr444le c4db6c469f211819d304afdbbf344900 -bgr48be 52336c5ad4b1229bdb34ea42226144f7 -bgr48le d3f1f46e272e7c7725fc1d482f3687b7 -bgr4_byte 055b8d527f17497d5245fc1347b4cd70 -bgr555be f7f31cda9df45bd5f63c76fb0162426d -bgr555le 0093d7a253686eb79f579bc24962187f -bgr565be 53ac20cff64a4141b163640b143f74cf -bgr565le b29700c5b1300db3ab2e0e9af5bc2688 -bgr8 5eb0bbd04c4f484a8b334d94304ea7de -bgra cdea0a048183daf1aa71cb1226347270 -gray fd2289b835017587db913c38060bff53 -gray16be d681ecf7b10b50d074866a3c10fc79fc -gray16le d043ab55f76282cbabef7c8af2cb0cee -monob 2065fd7c9ab96979b969678ddf62656c -monow b143abb40550d66f4730e8eb5318e1cb -nv12 e25d6330c5474e3cf3ae3c3166c347f3 -nv21 27a634b83bb84ef857c5e1e55f6319a1 -pal8 0d9a7cb823d158890add60c1e00fbbd4 -rgb0 34b97a7607d34794cfe1bc9945b3b6d7 -rgb24 bd3cd61dd250a2140939c876cd0eec58 -rgb444be 1e3baed4723a7011bc1457ccccaa2806 -rgb444le 7d7a857d60eb8bb2ed8088afefa22f45 -rgb48be 3d0a72dc5e82241b4bc39341232e9be7 -rgb48le a933caeab470831b5e55145bb2e9baf2 -rgb4_byte b9948106ff030f658840cc220480953c -rgb555be 61986143c7372711ebb86ef1ea026519 -rgb555le aab038e44ac91e4e91390109d38abd54 -rgb565be 4e25ac845c96519ae34e077630778a73 -rgb565le 7285fefdd0d2486e99c1dc1b0c6f31f5 -rgb8 68b1cefad048a7d36b2a6123daa460f9 -rgba efef1ef98681bb79723f3b4d10bd27a1 -uyvy422 344794c8fbbfbd906ac0d5a5514cd78f -yuv410p 1e8c3156dc963dcb079688b430b1c0b0 -yuv411p 2737ad48cd2285fb133e9be1f9a9cf28 -yuv420p 3b9efd4c33f3085a50a51dfbc5a4a5d1 -yuv420p10be f93b411b661272389aff40fb6c411ea4 -yuv420p10le 6807cf71a20c8b37331f85b49e83deef -yuv420p12be 0d8b314b9831a008d9fa6b918f0f4747 -yuv420p12le 8762d6d306e225099bcc7955246abc0b -yuv420p14be 88772ae6715fbb5a2730d2d0ac3c30e6 -yuv420p14le abee7a9aa16dbcf257ac802d6ee3c770 -yuv420p16be 4883d2fc25e199dfef01d0131a5486d2 -yuv420p16le cff6975103082259414224f0721125ba -yuv420p9be 37df84a076eac4a1c8fe6c53e4684f9a -yuv420p9le 02e91e484f14af32ab7ca0b5c1f8e2f5 -yuv422p 25f74db9daefb5dba7de622c741998d0 -yuv422p10be dae7945ccd81810e52dc338984e8b868 -yuv422p10le c934050fd37931740c67756f51ce9018 -yuv422p12be 9d8cd9d80575bb7d66c9405e4125b6aa -yuv422p12le 26c433074422d16e4dd3af40e4f68b4e -yuv422p14be 76527aede5a9cba9bf77038e132fe445 -yuv422p14le 57062d9c84afad541192ad0b7edb04a8 -yuv422p16be cdb6bdaf0aab1b2108c485cac2270180 -yuv422p16le 6405652cceab04406e0da4d9fbed6142 -yuv422p9be c0ef13d609e0b6f04c55cf6f2a8264e7 -yuv422p9le b5d3fcf6503355ebb1f424cc43c037a9 -yuv440p 7e1bc3dade41c9c05b4edf112c1ee4cc -yuv444p 7fc0b7e65748d4f7744107d26ebe06f2 -yuv444p10be 82a8fda7281ccda727cd6b25da0e219b -yuv444p10le f5954f6dde3e09c83d9321f0b84f5275 -yuv444p12be 80c416697b0b006228019d6ea3c13257 -yuv444p12le 95eef7a4245229cb488141d83ea46df9 -yuv444p14be 71c4146d88c9cd27a4ba669d2869dedc -yuv444p14le 04f25ade3a02022997ed3f8469f126a8 -yuv444p16be 941710611d7bb3828163979eaa4cfe35 -yuv444p16le 1896fd04ff664052ae74dfcb33ed13b5 -yuv444p9be 23ffab586f4fdd7b63604d782ec3291c -yuv444p9le db9137c4c96f892cb6d49c24d00b6e31 -yuva420p d3c91b0a968b248b24628cf0be7f82fc -yuva422p 062631b545bb922765045fbb6ad48d36 -yuva444p 294a3b99740a2b8f69c5f362a64b0ac1 -yuvj420p 0fccd4e9d15fd1e801b5f615cc66d7f2 -yuvj422p 659cf6f0caba0cfeaf3f471c4def8945 -yuvj440p 3af38ae458bcf7a32f7e7a3c0f012018 -yuvj444p 64c0788c6fb2ec4f5ac12918d3ec756f -yuyv422 66a8ac11d5a512f3f16c2a823f3d396a +0bgr a06d3a7652e4885c65895e0e168aab28 +0rgb b6b5653d2228cdf2ba3c55a72f2e713f +abgr 1a147fa04ed70b9a7e67a4c89052f630 +argb 997df0b5c268a0d8f9c611cae4e01e05 +bgr0 218df6dc3eb5094a0c16a8bd18bc3999 +bgr24 d6370f6dc34df2ea66e1718baf74137b +bgr444be aba6dfea008ae12c2120a95f54293904 +bgr444le cfb5401e8f076cc8675e17ed1114a3df +bgr48be ab65229b64606f6408cd732b967c0b01 +bgr48le f1b4e718cadee9bd2978289153ce43de +bgr4_byte de96505ef9ad7078f87b4dfdf6fe4b61 +bgr555be 8d5de9e9200d622f27dc73958a85045c +bgr555le 74eb9837706143a40e26305a16a79369 +bgr565be 13a36d6502be88fc0c2aec05b8d2d501 +bgr565le ed027571692aecd522aa65a90cc7e09b +bgr8 71ef789609c746c2e7e4be9dec29062c +bgra 0364b074268682ea46168742a8239f7d +gray 1e5e2b8548843a6898eedd9c974c422c +gray16be 389f4e5a8ab413b3af32767b59ed7f9e +gray16le a1f912941247e45b394b9cf4f0e81130 +monob 309b5785a36bd988d17e15d88f4ffad1 +monow 8809a02bc69b58d1114b09ca79ebffad +nv12 75e90c54d858b993e99f4ee6d2a2a38f +nv21 8831a3f411015d45fbc5dd191245ba9c +pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 +rgb0 992f5ad24802cc255edab45c3084db4a +rgb24 c71ba90f69f15c8275232bb3f62d0ced +rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 +rgb444le 5f29863553107110ea817f52151d77b7 +rgb48be a3bc81c46c21818a989f23104a599ab0 +rgb48le e87c661ac49aea1f1e93939802883d92 +rgb4_byte 293b1b84f01efd90bde40cb3faffc127 +rgb555be 5229183fa64d4e5c7e3703d8263ee6ae +rgb555le c3e9978cb2a4129a5575935e8cbc433a +rgb565be bc123b962629ead1a06af0c18cbb6e5f +rgb565le 20757fafe4756e62d845b2ab4c0b8f93 +rgb8 e01614f5416dcc8ad365ad7a57afc9fb +rgba 53796fa4c392a1b2659595b6a284f8c4 +uyvy422 3f411f947e3ac8f842c88e717d68bd9a +yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db +yuv411p 9461b188dab6f8b90d9a27e353a89f58 +yuv420p 61fffd2d8425759a33ae07e718d0242d +yuv420p10be 2abf90242cb021cb6fcf9f2c3c92f6a7 +yuv420p10le 180b7e4de684c7225d2fb37614f842cb +yuv420p12be 256c9e6cfc878a8abf681b30777c0620 +yuv420p12le 8dc8b86c4790da3769d4a62e87608623 +yuv420p14be 8d22756c5d2b9e501924c082bfb22a6c +yuv420p14le c9da19d4818bcb119ad6481b75778f7e +yuv420p16be 4ccdcca6dd6a960f9a3333f0aee095bd +yuv420p16le 9c5847d9b0de258a10ee906dc47e24ea +yuv420p9be fa7ad4f73232aac0e35def62af1e2c39 +yuv420p9le 3720ba1786b56c8f4913e67dddebbb07 +yuv422p eee223e92f1f2e5ad4186b411ebf5816 +yuv422p10be 80fa87750491dcc3e93d175b64835654 +yuv422p10le e1640cd315bd96c6b59f7753825a7306 +yuv422p12be 8a17ae3a5f565479ec4aa230ef78a6fa +yuv422p12le 04215506e2eca5b79f47e322a5949a58 +yuv422p14be 0fec4a6615ff610e3ea5e85acbd1b273 +yuv422p14le a54c6121c1cb713a33961ea0faa35956 +yuv422p16be 1f3c216927d17966a009a42def124bba +yuv422p16le 90adbdffaeea9b09398339c8a1322b02 +yuv422p9be e46446534dd0821029d3b831c9c1d1b0 +yuv422p9le 520e418a2429f7efee511b7fcbf45ab6 +yuv440p 456d83524b299f2fa1bb988e421554d9 +yuv444p 068bc09d282d18c9fa35c2787943fc2a +yuv444p10be 9f6e1490080a454243daee9229425e1e +yuv444p10le cc183e51041351d9ac06c4df6e8ad5f7 +yuv444p12be df420773bb3cca2ffb585db3bbe01195 +yuv444p12le 25c0c73d98c3c1e281044d79097608f5 +yuv444p14be 516b18e8331e7d404c7541bafc5501e6 +yuv444p14le 7c88d9a233979d73762cffef2fe08306 +yuv444p16be 4000b12fa88ed0feef182da31c7e6b96 +yuv444p16le 96a857dba8dc6792c58daec872825b32 +yuv444p9be 07727e5c9040b7f0a17d591288ac330d +yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 +yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuvj420p 73661456012f20cda81207b14bb0c0a5 +yuvj422p aa97862b57f47c5a6506156e9aaf129a +yuvj440p ff8b9884a49d546b035f5d2ac1e673df +yuvj444p b8142888d80b8065c54045839e79b331 +yuyv422 f06a4fbbdb32807d05de825daa2c3a1b diff --git a/tests/ref/lavfi/pixfmts_pad b/tests/ref/lavfi/pixfmts_pad index 3ae264646f..9c319744e0 100644 --- a/tests/ref/lavfi/pixfmts_pad +++ b/tests/ref/lavfi/pixfmts_pad @@ -1,24 +1,24 @@ -0bgr 39255df20922b1ffbaf70dc095487e21 -0rgb 7d6879c66b36a52e66ce55c833c3d682 -abgr 4e4ddc8e47c56e7ffb29aca591d77623 -argb 6d79953e088f65ea6fb95286ef3c1880 -bgr0 50c141e60199c26bdf3d4b994d8e318a -bgr24 65210d503b3f5380c532cac7258a1d8e -bgra a423aa1c18e906b74934b9825b009687 -gray 1448406951db3b14afeda8681639042a -rgb0 85a38e1832a0036e9fecb49198b544f9 -rgb24 9d6e7d76fd977bccdfe4571b65ffd41f -rgba d7b6c63b3c1e56bb2976cb2b9dcb4eeb -yuv410p b41268b6e7ac9ae188d4ba37a667bb82 -yuv411p 324c95080f6725a3105e1a096e428d40 -yuv420p 8fdb1e60d83cfe518c834495c12272ac -yuv422p 0d24f8ff377eac785fdfb323c4e99535 -yuv440p 33fa2a5965b6ac3163d60f5c17754c04 -yuv444p 861639f66416b7e84081397a75ff51a1 -yuva420p 3b367091a0a2572b6ae3a403fba21d23 -yuva422p bf50940eec9adb3bea0342e8e04e7d66 -yuva444p d863cce447e17e6b7d3a085ea90d3ec3 -yuvj420p 98f4b0ba6c369690eedcbf0c520710eb -yuvj422p 77a50bd244f134cdd458ff3bf518624b -yuvj440p c22aa02255577c8ac7d6594d31560bcd -yuvj444p c6ff986ff5be81c5462cc3a5ccf7426e +0bgr 36ba5b43e0ac64d8daad4f897efd8cdf +0rgb cc3ca0f63885af19b3daa4504cadcc19 +abgr 9ddb78f395d7d3f75b65b5309223c0c5 +argb e5fbb7bb282a80897b8f730627f68876 +bgr0 c55368036cccbb0af471d6bd82abe02a +bgr24 67f9fd70dc6d9896b7122976b33932b4 +bgra c8dd017b5a3b55e8b9d0ac1cdcf327bd +gray b1abadae3718522aa57a7972da8cbe17 +rgb0 b1977b45634c4db58a183a07feb2acff +rgb24 e73de9dc0fdd78f4853c168603cc7aba +rgba 5a36df3c5ba623b589728a5a442e98e2 +yuv410p ff246b8b41d3d4a3eb90414ae3031123 +yuv411p a82c606c665fa747679aa8bfffa8a5db +yuv420p 0fe4d9031999f83ca96292ec2025f272 +yuv422p 5e0bffdac30b39f1bae9ec54fd9a6a34 +yuv440p 5e338303cd89d1d76ab918e5bec1e90d +yuv444p 248bdf9747d5c3718580dc2279e2e273 +yuva420p b5bdefbb0c5b302b6d18ee4df7c1d7c7 +yuva422p 8b56b36d9eb3c382d2a5a695107e759d +yuva444p 389cf95e98bf24684a42d5d67b913e16 +yuvj420p d182ac937d312e4894c1bc548883bf1c +yuvj422p 26ac91b5daf6f2f1f3c22be489e994a3 +yuvj440p 63e2b94f81e0a6f2868055a4c8258b63 +yuvj444p 64f103c7db8fc803d062db7ed2b8dc76 diff --git a/tests/ref/lavfi/pixfmts_pixdesctest b/tests/ref/lavfi/pixfmts_pixdesctest index 1939a85d34..918efbc2ef 100644 --- a/tests/ref/lavfi/pixfmts_pixdesctest +++ b/tests/ref/lavfi/pixfmts_pixdesctest @@ -1,83 +1,83 @@ -0bgr 5d27afc2cf2ce274929dd4de94a2efbb -0rgb 62e3a1d9253df23bdaf4ce30fad89e13 -abgr df72ca35d31621dfb793a68e3a058c0e -argb e798ab12f3aeb454ada73dff71a03fcc -bgr0 c650c5a5f7d1e63f36f3c601119bac02 -bgr24 2100f953dea4ef10eb1b51bdc913733e -bgr444be 9ac705d6b376e54179e7270e22121e69 -bgr444le c4db6c469f211819d304afdbbf344900 -bgr48be 52336c5ad4b1229bdb34ea42226144f7 -bgr48le d3f1f46e272e7c7725fc1d482f3687b7 -bgr4_byte 055b8d527f17497d5245fc1347b4cd70 -bgr555be f7f31cda9df45bd5f63c76fb0162426d -bgr555le 0093d7a253686eb79f579bc24962187f -bgr565be 53ac20cff64a4141b163640b143f74cf -bgr565le b29700c5b1300db3ab2e0e9af5bc2688 -bgr8 5eb0bbd04c4f484a8b334d94304ea7de -bgra cdea0a048183daf1aa71cb1226347270 -gray fd2289b835017587db913c38060bff53 -gray16be d681ecf7b10b50d074866a3c10fc79fc -gray16le d043ab55f76282cbabef7c8af2cb0cee -monob 2065fd7c9ab96979b969678ddf62656c -monow b143abb40550d66f4730e8eb5318e1cb -nv12 e25d6330c5474e3cf3ae3c3166c347f3 -nv21 27a634b83bb84ef857c5e1e55f6319a1 -pal8 0d9a7cb823d158890add60c1e00fbbd4 -rgb0 f234ca6f8a7eeec90eb1eeb89b45e779 -rgb24 bd3cd61dd250a2140939c876cd0eec58 -rgb444be 1e3baed4723a7011bc1457ccccaa2806 -rgb444le 7d7a857d60eb8bb2ed8088afefa22f45 -rgb48be 3d0a72dc5e82241b4bc39341232e9be7 -rgb48le a933caeab470831b5e55145bb2e9baf2 -rgb4_byte b9948106ff030f658840cc220480953c -rgb555be 61986143c7372711ebb86ef1ea026519 -rgb555le aab038e44ac91e4e91390109d38abd54 -rgb565be 4e25ac845c96519ae34e077630778a73 -rgb565le 7285fefdd0d2486e99c1dc1b0c6f31f5 -rgb8 68b1cefad048a7d36b2a6123daa460f9 -rgba efef1ef98681bb79723f3b4d10bd27a1 -uyvy422 344794c8fbbfbd906ac0d5a5514cd78f -yuv410p 1e8c3156dc963dcb079688b430b1c0b0 -yuv411p 2737ad48cd2285fb133e9be1f9a9cf28 -yuv420p 3b9efd4c33f3085a50a51dfbc5a4a5d1 -yuv420p10be f93b411b661272389aff40fb6c411ea4 -yuv420p10le 6807cf71a20c8b37331f85b49e83deef -yuv420p12be 0d8b314b9831a008d9fa6b918f0f4747 -yuv420p12le 8762d6d306e225099bcc7955246abc0b -yuv420p14be 88772ae6715fbb5a2730d2d0ac3c30e6 -yuv420p14le abee7a9aa16dbcf257ac802d6ee3c770 -yuv420p16be 4883d2fc25e199dfef01d0131a5486d2 -yuv420p16le cff6975103082259414224f0721125ba -yuv420p9be 37df84a076eac4a1c8fe6c53e4684f9a -yuv420p9le 02e91e484f14af32ab7ca0b5c1f8e2f5 -yuv422p 25f74db9daefb5dba7de622c741998d0 -yuv422p10be dae7945ccd81810e52dc338984e8b868 -yuv422p10le c934050fd37931740c67756f51ce9018 -yuv422p12be 9d8cd9d80575bb7d66c9405e4125b6aa -yuv422p12le 26c433074422d16e4dd3af40e4f68b4e -yuv422p14be 76527aede5a9cba9bf77038e132fe445 -yuv422p14le 57062d9c84afad541192ad0b7edb04a8 -yuv422p16be cdb6bdaf0aab1b2108c485cac2270180 -yuv422p16le 6405652cceab04406e0da4d9fbed6142 -yuv422p9be c0ef13d609e0b6f04c55cf6f2a8264e7 -yuv422p9le b5d3fcf6503355ebb1f424cc43c037a9 -yuv440p 7e1bc3dade41c9c05b4edf112c1ee4cc -yuv444p 7fc0b7e65748d4f7744107d26ebe06f2 -yuv444p10be 82a8fda7281ccda727cd6b25da0e219b -yuv444p10le f5954f6dde3e09c83d9321f0b84f5275 -yuv444p12be 80c416697b0b006228019d6ea3c13257 -yuv444p12le 95eef7a4245229cb488141d83ea46df9 -yuv444p14be 71c4146d88c9cd27a4ba669d2869dedc -yuv444p14le 04f25ade3a02022997ed3f8469f126a8 -yuv444p16be 941710611d7bb3828163979eaa4cfe35 -yuv444p16le 1896fd04ff664052ae74dfcb33ed13b5 -yuv444p9be 23ffab586f4fdd7b63604d782ec3291c -yuv444p9le db9137c4c96f892cb6d49c24d00b6e31 -yuva420p d3c91b0a968b248b24628cf0be7f82fc -yuva422p 062631b545bb922765045fbb6ad48d36 -yuva444p 294a3b99740a2b8f69c5f362a64b0ac1 -yuvj420p 0fccd4e9d15fd1e801b5f615cc66d7f2 -yuvj422p 659cf6f0caba0cfeaf3f471c4def8945 -yuvj440p 3af38ae458bcf7a32f7e7a3c0f012018 -yuvj444p 64c0788c6fb2ec4f5ac12918d3ec756f -yuyv422 66a8ac11d5a512f3f16c2a823f3d396a +0bgr 2b46a6ce47a19ffc240e4e93f498f491 +0rgb e90e5d377a3e5af69fdf7b60cbf88f51 +abgr 1a147fa04ed70b9a7e67a4c89052f630 +argb 997df0b5c268a0d8f9c611cae4e01e05 +bgr0 b61591a68252e66c576b9bb074a9eaed +bgr24 d6370f6dc34df2ea66e1718baf74137b +bgr444be aba6dfea008ae12c2120a95f54293904 +bgr444le cfb5401e8f076cc8675e17ed1114a3df +bgr48be ab65229b64606f6408cd732b967c0b01 +bgr48le f1b4e718cadee9bd2978289153ce43de +bgr4_byte de96505ef9ad7078f87b4dfdf6fe4b61 +bgr555be 8d5de9e9200d622f27dc73958a85045c +bgr555le 74eb9837706143a40e26305a16a79369 +bgr565be 13a36d6502be88fc0c2aec05b8d2d501 +bgr565le ed027571692aecd522aa65a90cc7e09b +bgr8 71ef789609c746c2e7e4be9dec29062c +bgra 0364b074268682ea46168742a8239f7d +gray 1e5e2b8548843a6898eedd9c974c422c +gray16be 389f4e5a8ab413b3af32767b59ed7f9e +gray16le a1f912941247e45b394b9cf4f0e81130 +monob 309b5785a36bd988d17e15d88f4ffad1 +monow 8809a02bc69b58d1114b09ca79ebffad +nv12 75e90c54d858b993e99f4ee6d2a2a38f +nv21 8831a3f411015d45fbc5dd191245ba9c +pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 +rgb0 5774780b3c532896300fa326fcde01a8 +rgb24 c71ba90f69f15c8275232bb3f62d0ced +rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 +rgb444le 5f29863553107110ea817f52151d77b7 +rgb48be a3bc81c46c21818a989f23104a599ab0 +rgb48le e87c661ac49aea1f1e93939802883d92 +rgb4_byte 293b1b84f01efd90bde40cb3faffc127 +rgb555be 5229183fa64d4e5c7e3703d8263ee6ae +rgb555le c3e9978cb2a4129a5575935e8cbc433a +rgb565be bc123b962629ead1a06af0c18cbb6e5f +rgb565le 20757fafe4756e62d845b2ab4c0b8f93 +rgb8 e01614f5416dcc8ad365ad7a57afc9fb +rgba 53796fa4c392a1b2659595b6a284f8c4 +uyvy422 3f411f947e3ac8f842c88e717d68bd9a +yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db +yuv411p 9461b188dab6f8b90d9a27e353a89f58 +yuv420p 61fffd2d8425759a33ae07e718d0242d +yuv420p10be 2abf90242cb021cb6fcf9f2c3c92f6a7 +yuv420p10le 180b7e4de684c7225d2fb37614f842cb +yuv420p12be 256c9e6cfc878a8abf681b30777c0620 +yuv420p12le 8dc8b86c4790da3769d4a62e87608623 +yuv420p14be 8d22756c5d2b9e501924c082bfb22a6c +yuv420p14le c9da19d4818bcb119ad6481b75778f7e +yuv420p16be 4ccdcca6dd6a960f9a3333f0aee095bd +yuv420p16le 9c5847d9b0de258a10ee906dc47e24ea +yuv420p9be fa7ad4f73232aac0e35def62af1e2c39 +yuv420p9le 3720ba1786b56c8f4913e67dddebbb07 +yuv422p eee223e92f1f2e5ad4186b411ebf5816 +yuv422p10be 80fa87750491dcc3e93d175b64835654 +yuv422p10le e1640cd315bd96c6b59f7753825a7306 +yuv422p12be 8a17ae3a5f565479ec4aa230ef78a6fa +yuv422p12le 04215506e2eca5b79f47e322a5949a58 +yuv422p14be 0fec4a6615ff610e3ea5e85acbd1b273 +yuv422p14le a54c6121c1cb713a33961ea0faa35956 +yuv422p16be 1f3c216927d17966a009a42def124bba +yuv422p16le 90adbdffaeea9b09398339c8a1322b02 +yuv422p9be e46446534dd0821029d3b831c9c1d1b0 +yuv422p9le 520e418a2429f7efee511b7fcbf45ab6 +yuv440p 456d83524b299f2fa1bb988e421554d9 +yuv444p 068bc09d282d18c9fa35c2787943fc2a +yuv444p10be 9f6e1490080a454243daee9229425e1e +yuv444p10le cc183e51041351d9ac06c4df6e8ad5f7 +yuv444p12be df420773bb3cca2ffb585db3bbe01195 +yuv444p12le 25c0c73d98c3c1e281044d79097608f5 +yuv444p14be 516b18e8331e7d404c7541bafc5501e6 +yuv444p14le 7c88d9a233979d73762cffef2fe08306 +yuv444p16be 4000b12fa88ed0feef182da31c7e6b96 +yuv444p16le 96a857dba8dc6792c58daec872825b32 +yuv444p9be 07727e5c9040b7f0a17d591288ac330d +yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 +yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuvj420p 73661456012f20cda81207b14bb0c0a5 +yuvj422p aa97862b57f47c5a6506156e9aaf129a +yuvj440p ff8b9884a49d546b035f5d2ac1e673df +yuvj444p b8142888d80b8065c54045839e79b331 +yuyv422 f06a4fbbdb32807d05de825daa2c3a1b diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index b7cb333074..3713142d86 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -1,83 +1,83 @@ -0bgr 3ce1bc9a34055286b52265cc28ea349d -0rgb 19c8fb4fa3a2495f99ff983065ed3c4b -abgr 752147a57d2c92be19cd213a8333221a -argb 77935afa001798a0726ec3d5d4736bc3 -bgr0 3ac1843150596ea403c1aa61efb67dc9 -bgr24 0fb9cabd8f7e5d271308525e5e458698 -bgr444be b304d229ae359b3bb635c192ed299624 -bgr444le 7c0d23fa832ad2e02e4106f4673aa23b -bgr48be e6055866a17501886d779ca115331df4 -bgr48le 03a121ba6573682b403488000d48b2de -bgr4_byte 8fb31aad8da39afe0598f7abe3c82dbb -bgr555be bc008dc5a62c8def883b5a72507a39ae -bgr555le 41003f5722d8ce5815c3e521549b869b -bgr565be 775ac4f0448bdccaba79d37246d56117 -bgr565le 72fa806e8eeef8c07c25db0fc38a6620 -bgr8 1b485af4ff09100ec5652a1252fd7375 -bgra 9e9eeff202945efd21ed81c52daf8377 -gray c57498d4feadc8be0011b48f5b28342c -gray16be 79e8e0ca7bd94caac2f0ff0e23fc0357 -gray16le 7293cad3f2a7e0eddbf16a6e72b18b0e -monob f88ddda6cefa9f929cd326afa22c38bb -monow 1de0dae8147457014cf3587a47cd3e25 -nv12 97abee51c02b9db40e171a9b8b6d736a -nv21 4d2eaac53eec063d2511bbb137f4970f -pal8 7bf10078edfd8ac5e65e7943e2f79d98 -rgb0 d82f9bbc741c375b5dc809604b5702a5 -rgb24 6d50ac7ccfef26e62a7f5349c6dab408 -rgb444be d6bfa7109e4c5e16bb761f0e88f785cd -rgb444le 3c31c549f0da666f3bcd939530167ac4 -rgb48be d6f5b8b2a8462835005787bc8e5ce9f0 -rgb48le 5ffbddea96d6ee5b02a71df4035ccda1 -rgb4_byte 2886596132c90eb609d1b2f84ddaa22c -rgb555be f383d09f5dee8892d1200e36e8173d39 -rgb555le bf397518d047d7d6b809c1844a31354a -rgb565be ee180ebad7672fd85aff6c06d0c89ae3 -rgb565le faaefce7053966bdcab2726eda02e586 -rgb8 7ba9b4e02d09d25add74459f97f50247 -rgba 996e2d84bc763daf4c509c5c14cca080 -uyvy422 cd6b284abeccb2385e081445d4e3aa2f -yuv410p b72725b068f8c71a762cae7e4873adb5 -yuv411p 2216b78c99e1a13ed29b9451f60c32cd -yuv420p c89df73fa9cbf6118f8250558e1dfdd0 -yuv420p10be d5b9d95d4f91ca081566cb64c0f17dce -yuv420p10le 618452c8ea0165ab0eaf0598f9f92ac0 -yuv420p12be 4203650200b824b9705db569aa377c5c -yuv420p12le a71bcbd55ab5aff72b14d0103f8958cd -yuv420p14be 821ffa04da5ca99e5596d0da6d240b78 -yuv420p14le 7993673b9a2cb52fed6c8807b4f72c9d -yuv420p16be 8ac3443f8881e479aed5468a164f807e -yuv420p16le 92ba73688ed22b3c96d95835e2e2533b -yuv420p9be 09b7483451fa813c714f924f7b40a8fa -yuv420p9le b48d1dc7637252dbbc644f3fdf966663 -yuv422p dd118f69ba9f16848f116e2d1f60def5 -yuv422p10be bd8dc8d310e5934bba851342931f458f -yuv422p10le 5aa0cbe20cb0d50d141a42331d7d4f6a -yuv422p12be d8786641471bc5e238ba4bbdc5c5c084 -yuv422p12le d84fb7e079646d340d38508b38006042 -yuv422p14be 0bcab72d67b81d02f192e4f47f444bf3 -yuv422p14le a0d4626e49a418146c719cd42247245f -yuv422p16be 17f451e622b2c7a66771b8bb90b6f5e3 -yuv422p16le 5787ef9812d6036488abed7a0a8bef65 -yuv422p9be 813699e5aa414cf74cc5dd52fdd3d7de -yuv422p9le a898e90e20341e520e225887b37d9b11 -yuv440p 20ee65fbdfeae7a307b1ccdf49aaf5b7 -yuv444p bddef5056de6948d3fb26313e24aa0fe -yuv444p10be fc52d848951db516707a22bc9cf4ce99 -yuv444p10le b0f6db34a21faaa829ae57450562533f -yuv444p12be 3f8d2d9c5c086b3d587b4955113595d4 -yuv444p12le 3af051e5d91523a463840462fd233d92 -yuv444p14be 0dbda95a1774e95dbe48d0ab8314a6df -yuv444p14le 8a23777e2d71f36d261eeabc043b24a6 -yuv444p16be 0a4c5aabd96cd3bd46ee4f80288d9b58 -yuv444p16le 1f971e9b86b48c5ab6747d895fbb4d48 -yuv444p9be 257af554645bbdcfef98bac6e2850df3 -yuv444p9le 99b4df1d55962c165ea67d2782d8b3c5 -yuva420p 138a51ee43fb46b532225b62ff9e41b6 -yuva422p 70bb6eb9dbc6b231ae5564f0a937d390 -yuva444p 0eb0627369313b663fa63dd5eaf09cd1 -yuvj420p 1fd2fc85b7d994f8ea9c4922fa51bb44 -yuvj422p fc37fe1eba137c7f3caba130361e9859 -yuvj440p 0cb99655f287d60b5449773cc4c0325f -yuvj444p 6f08b459c6b5cbe87485d679a15ac09f -yuyv422 62f84b3f66a83ec4a342a5ee89496808 +0bgr 710350573339f608b23e5bf8ea3327d0 +0rgb ba87d80ccd24ffb20ac711511132adb8 +abgr e448ff50225b119979987e55399e49e2 +argb ef03d804e0de6315fd59e3d2edaddb9d +bgr0 93cd61cfcbef1789d2d5ccae4de75f79 +bgr24 793fc4c2b1c92ad4f7f4dca157e624d1 +bgr444be 9af6abe0bc74cdcc75b4ab2f441f5f67 +bgr444le b8c0e693ae2cbd7c03abcc3aeb4bf7b4 +bgr48be 3aa33b667b9baefe3f17ef44360688cd +bgr48le eaf353ab363fbb279fd72d6c6e3b8855 +bgr4_byte a6e269daf7085504a01113ce5e8bff57 +bgr555be 9d71206c1a5373b8978126e5f5779726 +bgr555le 025caaa21fed9d14c382cac26af778c8 +bgr565be fca6f07daf23d9dd84381dd4c9afd959 +bgr565le f524e9f16bdd68b247dbcb621e543fc0 +bgr8 68a3a395043dc57335ad1f8e891229c5 +bgra 3eaf5489b8aa13a3388aad3751b597bf +gray 045c35e6cc7d41460f2b96b3e254deab +gray16be 70064f9acdc5e3935ccda67e765bf2fb +gray16le 578241fb43029e5ae841a3c94d940dce +monob 91ec2a25b13f6ca34d42da778b217de0 +monow a991455fda8f60f373aeb744456996b9 +nv12 0617f1e13ae4a43d4cb49282b9c02f71 +nv21 8a00d5d29766c1251eeda74c0ddee3f2 +pal8 7849884994cf99604f025b053332d08d +rgb0 6a9d26ebf674f02b5a8830583ba7a171 +rgb24 1de2978e23ad10b9b4ca2777688b4546 +rgb444be 88f534c5d07ebf5a4374484aed540893 +rgb444le c243685bfad7c243a78892a0dafe2b9f +rgb48be 874c8e2305ce9d82165ffddf2854d1f2 +rgb48le 877075f2ff2d9a0aec6fec843385f126 +rgb4_byte 4a8b119cf1996efe273302da29cbfbfb +rgb555be 8aeefa1fc4eba200abee3b1eb52186af +rgb555le 0495a7c13f9b0d0253379d5ae90cf6c4 +rgb565be 5168b66e69c25351948085e5fc51bb3a +rgb565le 301a4d41f0db3aaed341d812ed0d7927 +rgb8 8e5786e83099bc89d2e38a76e6dfcc52 +rgba de6a65b8c01bdad84e575202ca8b66a0 +uyvy422 479105bc4c7fbb4a33ca8745aa8c2de8 +yuv410p d0daa93f5cee83360e219e39563ab6da +yuv411p e5c8f3ca024a88dd07e0a92db3e2133d +yuv420p 485d9af8608f926ffffbf42230b4150d +yuv420p10be e4f12002b46549779886f27fd3c6c645 +yuv420p10le 698b7a346ae6d1315280d3e28c86b973 +yuv420p12be 3d2f7485d277fb66503f6af88bc81b62 +yuv420p12le a19c3fd126c7a11d9632922e713ce555 +yuv420p14be a1fcbe583e2e687e89ced29260a51fe2 +yuv420p14le c689144ea25dd2f760331a6d525bebc2 +yuv420p16be 6ebcf48a9317c6265430cd3ba5f569a2 +yuv420p16le 604a7215f384488a38aa0cffdbcbe17e +yuv420p9be 7b293aec92897bf0a32ec3a02a20acf9 +yuv420p9le f37fdff7d6c62ebe2ab0cf791cd049db +yuv422p b1724528079199908c667b3428a7c01c +yuv422p10be 1c7281254fb980c123148dfd145c4a05 +yuv422p10le 959caa253354e897f01848db21b8006e +yuv422p12be 15f63e4cc4a175db4599af1c2aad4047 +yuv422p12le 08d08b2d2ab7482c41ebdf50fcc3ee3c +yuv422p14be ca008297abbb10b931a9e142747291ec +yuv422p14le 0fd39837ecd739f9da916dbf81f0b45c +yuv422p16be 4ccc3e0bc94eaf3a3350e4d694c3a56c +yuv422p16le dde889032f13fa5f8d76b8484dd73116 +yuv422p9be ba5eae7669d02a13f54a592344612098 +yuv422p9le 2deb39425d924a15c8946df79ceaa579 +yuv440p 19de0ba1fd354b42189e96cdf73ef7cc +yuv444p fba8a00cd0b182af82e9de3b2f4d2c8a +yuv444p10be db89397ac4d33e66b5eab3678661f73a +yuv444p10le 28208677f07d4e4191ef228c096f3297 +yuv444p12be e41f8e27049c52da647e3d6927b591b3 +yuv444p12le 9428605417583e26041cb2b8d166df62 +yuv444p14be a71cad94426e92d77e2f548d4d21a7c0 +yuv444p14le adfe8463839fe67394529299620c078d +yuv444p16be 07e27200d2f4382090ca260874f02e92 +yuv444p16le f8bac16bf1f2afbd3626e07bcc815a9f +yuv444p9be db739906e3ae3b8792cdc5a0c3387565 +yuv444p9le 693b8d30958ef1a37296b1690b4b36d2 +yuva420p df46b738bdaf30d3a7f880b5ae45b092 +yuva422p 650755270debb03d2c03b2e93b64c576 +yuva444p 72083e0941cc45af9f97b89d3cd16112 +yuvj420p 31386dce60a2dcc493da5d0ed9d880df +yuvj422p 492452e50a3fe66724840cad29be4098 +yuvj440p 7632893e81d3f4f3ace3755f97479897 +yuvj444p 389388dd5d623f660c30ab840807ce82 +yuyv422 518be9b5ac93c365c0962453770fbe73 diff --git a/tests/ref/lavfi/pixfmts_super2xsai b/tests/ref/lavfi/pixfmts_super2xsai index a49c22349c..964d04a318 100644 --- a/tests/ref/lavfi/pixfmts_super2xsai +++ b/tests/ref/lavfi/pixfmts_super2xsai @@ -1,14 +1,14 @@ -abgr f2d45b9c0696514cffb776d41ce28c72 -argb 7764fa15f6029ecdf67b4646497c1b9f -bgr24 fbd7f1191c94c16b7b4916c55d75aef5 -bgr555be 887658475864bd33b9d713c2ac313ce9 -bgr555le ee4f1ad5c162ed7ee7969a2dc745f4d2 -bgr565be 0a635551a328942410f78e3f9da173cf -bgr565le 298fc08900612eb873585d4f6c13395c -bgra 1016f5a3cd58ec4589bd01706a2f6026 -rgb24 1a05a569e202f5e613fbdb109d0afd79 -rgb555be f475acd7d279760febd0f361d90848de -rgb555le 0b1b2082055a6af93ddd386a3aed480e -rgb565be 003a2862e6380742c86d020a73e15386 -rgb565le b2059339b144c4a3bf4508dbf52b4d50 -rgba 03a4873617d083e784cc70554556904d +abgr b04e3dfb0043f6eb04a573d2d13052eb +argb 257e33717d23298430025c0665642cd5 +bgr24 3765d88f93d4ae8baa2cfbc64b0b32e1 +bgr555be 81832e6269c509be55bba49bdd0ebed5 +bgr555le 56772e91aefba4013890d156866730ce +bgr565be 0b3c420fbddcec5a420c285b3c4b8792 +bgr565le 6cbded26d2bab8204afe2115384c09a8 +bgra c81430c3d1465e37b6acaa19cc54e932 +rgb24 9899359a817e705dc5b9cc363d35a625 +rgb555be 9b60d9aa1f3c78edf9936894f37e3243 +rgb555le 917fa8565f35882404a45fee3a947bf7 +rgb565be 12edaab49440fbb3aa4c1835fd697745 +rgb565le 5bf91cb1767066f23f0c672dedb4d476 +rgba 71687289b6c3ab6fa727d468de459026 diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index 1fbfb5b284..50a459dec0 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -1,83 +1,83 @@ -0bgr 65c37f17fcefbb9e13ea881e3d2a6ed9 -0rgb d978d6197e4d8e3cd1c5a16635e33191 -abgr d82c78ce55ee7b13283eb06808ff2c55 -argb d61204b1ea19631f62cd5da9829e53cd -bgr0 91df7d7d8dcc28e8a792cb586d6ea2e1 -bgr24 590f785b2ee4d07e6a143f8d962d4252 -bgr444be c912d3590e369bf33c9a108624b4020a -bgr444le 0e617f21fa0907f0d3ca15028227da48 -bgr48be 351903aa49b9951c31fa2247e5763a8b -bgr48le b62dabf1c65dccb0bfa29d76f0d14dfd -bgr4_byte 1231cb20123f1396d26608a3d7d33df3 -bgr555be 1c4560fd6879240386024820b3283dc6 -bgr555le cb2ae3a3fd8693fdeb8aac18e8982178 -bgr565be b39020a17ecb6737cfee1f82982a3023 -bgr565le 38c30ce0681569d9b5d65750a78d456e -bgr8 2a38e3955f833fcc97dd80ac859d2f7f -bgra 16ca43eaa67266c1b41462f9cf5d5d88 -gray 955616d3028b294487f48c2e345fc59b -gray16be c782215b065c9aaa12ee71845fee7b0a -gray16le f0febe0cf21c0197ae14292c53564fca -monob c08eed9f0ce665ea022d3f0e40cbe88e -monow 6cc761140ff9b184332ac001d5b54564 -nv12 49aaaf2ae4d30b60e30b476a713cf902 -nv21 32e66dc464e57815125853a9b6c2d281 -pal8 c5cebc912011c2735b57efad7cb13b89 -rgb0 7db53e57f7b59b08c90a1e694b679336 -rgb24 e3192324ac94044eb3e67be57d114d6d -rgb444be bf7591b8585221179f7df86fcabe204f -rgb444le 027539e7b7123bbba9e7cbddb0778b27 -rgb48be ced7163b1a735dda344b6c8730992f18 -rgb48le 8cf39f53c4d6db741de75e8ffbc40626 -rgb4_byte 33898e198a78da36f99a478ea2ebd305 -rgb555be af5f06480433283c39247d657861f495 -rgb555le 71b884b9418e252dec92bc6c062c9d6e -rgb565be bf35002836fcd31b8484fe98f729ee75 -rgb565le ead844d58860bbd831dead54bd9c133e -rgb8 c14c59ab2ef8c08929fffacc8bd05ac0 -rgba fd2fd45e3fd2ce4bbaac45f472f90fe6 -uyvy422 47bf2d601d82f6fbad6383ff8500fd94 -yuv410p f6e036bf18f3dee06a6832a504bfee3e -yuv411p e3df929f6911726ad710b48dbb93e505 -yuv420p b094859d64cdb8db951a1f664c316f62 -yuv420p10be f41e11631870288d96ebe6f831e510cd -yuv420p10le 6682733a0773e071fa3f21627845ddf3 -yuv420p12be 01b2b35f46f3f0d06e4e0375478296d2 -yuv420p12le 24e51174e989ea323113e02d5209476c -yuv420p14be 14fcc4482a47d001d194eb7b8a12c838 -yuv420p14le fee395f1d3406be6b6f6a126d56ea9e6 -yuv420p16be 4cd636eeee2280d2be0f3e3dc74556f2 -yuv420p16le 53626a1f9108e72a0dbb2a0c81c2fae8 -yuv420p9be c3ee1bf19c096823b36b1327092e7983 -yuv420p9le 1b4242fbd5926e234701ccedfc00d975 -yuv422p 170fdc8ea3b1eb34cc97443376f1be2e -yuv422p10be 8ad523d324d65fe10b1c623b530b58a7 -yuv422p10le da5741e5e4640bbccf7d0af32700c8cb -yuv422p12be fa2407c96417dbac01ac54d63683f850 -yuv422p12le cc4316bb8c4dd1b0b8b8a42f39642664 -yuv422p14be 133f3b7146ac02bc03816f6eb90dc5f3 -yuv422p14le 0ed9f7d3780937f35b5d64bdb2717b44 -yuv422p16be 8c21130d6fe0ebc6973d0a4b2ba7b3fe -yuv422p16le dba9c1f3632ba531223be16b7c2d2d3b -yuv422p9be eb50f2863e978f80fd531ae8995a7980 -yuv422p9le 2c4fd178d1615cbcb08de31a6bb54fa1 -yuv440p 4d969eb6639f126c7c98e6280bdf2baa -yuv444p b6c599162e07f65760a269b2d63b8ecd -yuv444p10be b27ea256178f708b6e9a1d20925e7637 -yuv444p10le 3f2c54115e916fc8a672f70fd747b84b -yuv444p12be 15f839b31abf06b094ba6ef25c835cd2 -yuv444p12le e8ad6ffa33cea8e6992adda3b0a1eba8 -yuv444p14be 76f3b394456962b0412b9b15ae895de6 -yuv444p14le 09907cfde0ac70a03afca65beab359c6 -yuv444p16be 85ec05f8bb62f1504ab1d3d60ad2a9b2 -yuv444p16le bb2fbe90f09cfb087356cfd9e92474eb -yuv444p9be 5173c8c8a5a72c876ba59279265b3700 -yuv444p9le 4408765b849e38aaeb894ed4876f130e -yuva420p a92c15d9ec21c44f702f1ba3db846736 -yuva422p b2ca7fed10696ab2b4f49075739fe9cf -yuva444p 460bf7143e465123ed04d6b07be1aa44 -yuvj420p 3b0da9747198b581441ad8532d3776b8 -yuvj422p d19d33320595f4e43f5bb1dcae98e8ab -yuvj440p 672fe1cd7cc5bcbdb4e1f923d9b57870 -yuvj444p 41a870a25c56ba531324540cbefbcfc5 -yuyv422 5a4482c46eb8bfa1e5c78b721f3d1363 +0bgr 30d1f7d7081c012556da0373e6d389ee +0rgb 66cd838e9c19f750c61efd73f66c42ac +abgr e6cc18ed21293e455d1dc63f9e1645e4 +argb b5383d783698a0b3d753d01f2498e490 +bgr0 f99729e70a94d1c278c292a7acdddae5 +bgr24 c48ec71c68a9840572a548c2ad141028 +bgr444be ab9253d2f836f58ff8f3f2b4ec76abdc +bgr444le b1bd8245a286b615e75e10d34fda4e62 +bgr48be b5355b4fa578b9422288507cf7fba2b6 +bgr48le 11dc232500b6339f58a9981f46d1d7a9 +bgr4_byte 531fd9a2249a213c89b1afc9788d070e +bgr555be 54ba55dc1dcc5a7f27f2727976be6583 +bgr555le a45c637fe5ce84b238b1e6f66fc8c852 +bgr565be 7100c2ddfee42e7efafec1ccefecf7c6 +bgr565le 9fab295d966386d4ef99d5b43066da47 +bgr8 275ce12eeb05de67a6915f67cbb43ce5 +bgra d29c35871248c476c366e678db580982 +gray a53528cdf80ed31c9897042a2ea16618 +gray16be 9b23f3e79c54a6ccb62e0135a32e3045 +gray16le 93cfa8fbb2a86ead275ce1817444e6d5 +monob c395a8efb9477b4ec53a77326e41ccd7 +monow efaee1c763ccd5ce1a8519d2ed5aa5a9 +nv12 77373304a9c732b65dab0a33afba9295 +nv21 1e70b3ce8be75f91f465a6d62df550c3 +pal8 be51ffaaad8e8428f2ce1e10d5729d3d +rgb0 84a83e576fc59ffd1ac5549fd7aa0023 +rgb24 a00171a51cbbdcc61ecbd0198b2e2513 +rgb444be 09a819863d3fe75518376cdac01c069f +rgb444le 4ab35fc85b8550be2a9b96dec9bf7306 +rgb48be 97a30a902d26b4840235926dae9028dd +rgb48le 82b33a864bab70d5463d57eaf693e78c +rgb4_byte afbfab537406988eab7460ec748a0389 +rgb555be 95e417e9429622245e2d2e0b1c3ab3e4 +rgb555le e4b35d8e9c1710f6d051fb4bda8700cc +rgb565be c70d86afbd68a073f2d4fe0eee3a9832 +rgb565le 991576c5d3308a73068a826543b3e7af +rgb8 42230235c5a2a66c0f9a2fcd20f9f5cd +rgba a6973a2940a378d2a8284194da26eec0 +uyvy422 21c48162379321bb83ec2399535f9253 +yuv410p 8699f50c04f8ac931aa5a8306827364b +yuv411p 47af34559b92b68851df4c2b170f7736 +yuv420p c59b35b82b5a195128736021913b35a4 +yuv420p10be fc5eed1744cdd033728362772a450e32 +yuv420p10le 141e6b39adac979765c846f3a5a8293c +yuv420p12be 0e0145d3592d56362c1bcc62cbd78a78 +yuv420p12le 8c3a2b27126df203786d4e05fd79e269 +yuv420p14be 6a11c75aa378f9628cd8fc3339474e68 +yuv420p14le e8b683876508bc0371582e2b8c0eb191 +yuv420p16be c467fae3a1936f3f91c19dd1c0c63e49 +yuv420p16le 87f09595ac106e694c538382179bfcc5 +yuv420p9be 31bc440f64fdd8d9e7cba897881345ec +yuv420p9le c6fed3016f03c49aa01bdcd63f846d3a +yuv422p 5e48541d3e659046ac0e1eacb038485f +yuv422p10be 9097b4d06f1fc598375b7c6480a2ba50 +yuv422p10le da7bd36f65cac06bd54bc9857493d835 +yuv422p12be 1203cc6c2294234ddc5435f48b192d7c +yuv422p12le 5cc76614210c026c3f1a5398f8654774 +yuv422p14be d52e4b435329e806c03860421b94f9fd +yuv422p14le 143937ee2e47fa35b71972a2aa74b772 +yuv422p16be 95ed65e718929dbeb5092bf0d852026d +yuv422p16le c62e554dde4a170177bec2efc3f4f1a2 +yuv422p9be b249cd58eaab5ccac6bae3e184774362 +yuv422p9le 696fc2a55f155edaaa9fc289574b2bb8 +yuv440p fca8395b7e43e2d0f38dd6ba822ef747 +yuv444p 1ef971a434c53e81c578e3c7cb9cbcad +yuv444p10be 3114a7469c2b9c440a9a9ccbd6e167d6 +yuv444p10le 34cb8774a1eb627b5f32825ac7d0ae9a +yuv444p12be d770e81c67d6fe707c239b422021dd29 +yuv444p12le 9aa076fb7ac058b34ae4e8f09d7895e6 +yuv444p14be 40a9bef6e22c4c3dfd1d9dbeecd701e3 +yuv444p14le 123539bdc6946cfb61bd0d82cf8c6f17 +yuv444p16be 35340098dc6956c34afce17bc6ffcedd +yuv444p16le 201e3acfa6f7628dfe2a1663de1128b1 +yuv444p9be 6143c321929ade9e0bc93ddea926e936 +yuv444p9le e43ba2026848ec803fabf74d77c10125 +yuva420p dc8fd115eaf203a3eac351b92a7d8f18 +yuva422p 6091f9c62a121c09eadb02e9173b2da2 +yuva444p 9a55e83047abcc7a709f20805070135e +yuvj420p 200b0332de9944e76c94d2e0699a5a2d +yuvj422p a19a89ef145305cf224ef5aa247d075a +yuvj440p 4240c9348d28af5f3edd0e642002bd2c +yuvj444p 9e11298ba9c4faae0f5c81420d2123f2 +yuyv422 867fff568fa4170503779c48e5f25e6e diff --git a/tests/ref/lavfi/pp b/tests/ref/lavfi/pp index 6a04bb98d5..bfa86ef9a8 100644 --- a/tests/ref/lavfi/pp +++ b/tests/ref/lavfi/pp @@ -1 +1 @@ -pp 9d6801cb6cdd2666d6f153622231e20c +pp 8e68fb247880aa083e91bcbddf9d76c7 diff --git a/tests/ref/lavfi/pp2 b/tests/ref/lavfi/pp2 index a3cda51562..819d4e41a4 100644 --- a/tests/ref/lavfi/pp2 +++ b/tests/ref/lavfi/pp2 @@ -1 +1 @@ -pp2 a6bde15c1a1a1499df0c48758820d505 +pp2 28e91376aeb49c79dae9221b1a4997ae diff --git a/tests/ref/lavfi/pp3 b/tests/ref/lavfi/pp3 index 5fca6c6789..295637545b 100644 --- a/tests/ref/lavfi/pp3 +++ b/tests/ref/lavfi/pp3 @@ -1 +1 @@ -pp3 8c7ec3f97cc6507be25ce0844c628bd2 +pp3 d8d19c1f5e3f4032e9ed7bbb2026f030 diff --git a/tests/ref/lavfi/pp4 b/tests/ref/lavfi/pp4 index 70995f6ff4..0557ca6082 100644 --- a/tests/ref/lavfi/pp4 +++ b/tests/ref/lavfi/pp4 @@ -1 +1 @@ -pp4 1b3fa0980c69c6634c156e53929066d3 +pp4 d79a3727359f62747edb82cc92ed040b diff --git a/tests/ref/lavfi/pp5 b/tests/ref/lavfi/pp5 index d24789d522..4265566a61 100644 --- a/tests/ref/lavfi/pp5 +++ b/tests/ref/lavfi/pp5 @@ -1 +1 @@ -pp5 6c58afa1e224d2884f42fa1f7d51101d +pp5 5dc5a1f0c67d8a78e32cf50f47d1b27f diff --git a/tests/ref/lavfi/pp6 b/tests/ref/lavfi/pp6 index ece74e7cd1..ca40024764 100644 --- a/tests/ref/lavfi/pp6 +++ b/tests/ref/lavfi/pp6 @@ -1 +1 @@ -pp6 23b2a314bd833ad20232b4a52bcb4af5 +pp6 40fb584b10082dff87fb947a1bccdbef diff --git a/tests/ref/lavfi/scale200 b/tests/ref/lavfi/scale200 index 2c03914b86..f267522379 100644 --- a/tests/ref/lavfi/scale200 +++ b/tests/ref/lavfi/scale200 @@ -1 +1 @@ -scale200 2d4bcb30bd9a583f9bb62efe34126c18 +scale200 e84ce966038a9f8f915704959f64278d diff --git a/tests/ref/lavfi/scale500 b/tests/ref/lavfi/scale500 index ea12586f83..ec4a699a9c 100644 --- a/tests/ref/lavfi/scale500 +++ b/tests/ref/lavfi/scale500 @@ -1 +1 @@ -scale500 f5cb0b192d86eabde2d990415cd705e6 +scale500 24e89b23ba4286162c2026181db8d2b7 diff --git a/tests/ref/lavfi/select b/tests/ref/lavfi/select index f94634c374..a9d2be00cf 100644 --- a/tests/ref/lavfi/select +++ b/tests/ref/lavfi/select @@ -1 +1 @@ -select aa747d1b7ca5de029c008e8250b96892 +select 7975bb8d0e326af9369379927324f1a6 diff --git a/tests/ref/lavfi/setdar b/tests/ref/lavfi/setdar index 3f7a35a52a..5bc7d5d34c 100644 --- a/tests/ref/lavfi/setdar +++ b/tests/ref/lavfi/setdar @@ -1 +1 @@ -setdar 8e09e3fd83c0d6c04c6c5b2b731dda57 +setdar 04b06d4622b116cdae756d4b475b9d5d diff --git a/tests/ref/lavfi/setsar b/tests/ref/lavfi/setsar index 9f1c889cc6..86592e8659 100644 --- a/tests/ref/lavfi/setsar +++ b/tests/ref/lavfi/setsar @@ -1 +1 @@ -setsar 8e09e3fd83c0d6c04c6c5b2b731dda57 +setsar 04b06d4622b116cdae756d4b475b9d5d diff --git a/tests/ref/lavfi/testsrc b/tests/ref/lavfi/testsrc index c8eab42ef7..8e2363b89b 100644 --- a/tests/ref/lavfi/testsrc +++ b/tests/ref/lavfi/testsrc @@ -1 +1 @@ -testsrc a175050c9c6351aca37945ec64669d2f +testsrc cdac8817054b30e086d6ecabdcec5444 diff --git a/tests/ref/lavfi/thumbnail b/tests/ref/lavfi/thumbnail index 775702ae4b..5cfbf50e4b 100644 --- a/tests/ref/lavfi/thumbnail +++ b/tests/ref/lavfi/thumbnail @@ -1 +1 @@ -thumbnail 067e76a08efb02d53b04259230e236bd +thumbnail 33c479d5701943253df5e6adc6bc8746 diff --git a/tests/ref/lavfi/tile b/tests/ref/lavfi/tile index fabfd8aa6a..472d32c294 100644 --- a/tests/ref/lavfi/tile +++ b/tests/ref/lavfi/tile @@ -1 +1 @@ -tile 823967ac614525193829af654284137c +tile e36d067fb3e6e7b96522b7b0124f3850 diff --git a/tests/ref/lavfi/tinterlace_merge b/tests/ref/lavfi/tinterlace_merge index 226e51505d..300713f747 100644 --- a/tests/ref/lavfi/tinterlace_merge +++ b/tests/ref/lavfi/tinterlace_merge @@ -1,10 +1,10 @@ -gray 24de1c96cee124e642ab4ee92e62e2f3 -yuv410p 231f422123cddd99bb569abf58b22772 -yuv420p abf98c200797e970d5f871bead44deb1 -yuv422p b17c9833a68955eb7b28e4da3341f9b8 -yuv444p a44bca88ce6d0afe52c29301fd0e90dc -yuva420p 926fcd2f96cb08de76c72f056fe25d1b -yuvj420p bbae7aa2382518bb46f330d0b6eb815b -yuvj422p cd21685cd612921ccc42cf28521139f3 -yuvj440p e1c7114e67babdde460a4f20d87b7686 -yuvj444p acb6465edef95ada6d7cfcf027d1e466 +gray c996e583bbc5a6f380463142eb77b7c6 +yuv410p c9bad1317b496071d6d895238638e07d +yuv420p 9794d11e59ec7bcdf9e30a433e4137b1 +yuv422p e852e61e455db8ee3981ea942d510b0f +yuv444p a38a3f65d2f358cde5e9547c897cfcd5 +yuva420p c1dc15d6ee78587d9f825acd795673d7 +yuvj420p 3ee7014727ee64b45292a4f15ba028d8 +yuvj422p 4f990d5473f15571276adb5770b3b773 +yuvj440p 9a005e8b8431aaa762fde8d942fd11a9 +yuvj444p e29bf9f42e3a3632e09df529979e0040 diff --git a/tests/ref/lavfi/tinterlace_pad b/tests/ref/lavfi/tinterlace_pad index 600c4f0053..722ac85aeb 100644 --- a/tests/ref/lavfi/tinterlace_pad +++ b/tests/ref/lavfi/tinterlace_pad @@ -1,10 +1,10 @@ -gray bca7d5868dddc5f46cf1d04c5b2d2b1d -yuv410p 37ddf2682d741d68fda642985243474c -yuv420p d0d4b03682f22b6aca12d7d3bb165576 -yuv422p b6eb830427726ba5af4a5a08920641d9 -yuv444p 7883e75f707c8dfb80997a0c5a86ef26 -yuva420p 4d06d440e793b16dceda7d7378795ea3 -yuvj420p ad5141f7da9df1b59b60f68e11fa95b9 -yuvj422p f63e368ed3356bb104c70df5dbe55846 -yuvj440p 8ad1d8507deb44cc6353321654bae519 -yuvj444p b936b099450f7fc0143b8948b477185b +gray 25a7d1ccf1a06c1a8a0520c1e6cb30ff +yuv410p 17163d1b4f21d894598fc62e6aeb8141 +yuv420p f8bbae33295741c1c17d33ff8ee16f7f +yuv422p 4fa67d1580d3453942bb0950c5784f6e +yuv444p f0558305fb7ca65b5b86d3ee88c4201e +yuva420p 7c76c0ca03a62275d25e8140c68da2b9 +yuvj420p b5b7baf11946a2265fc56e48be5b0436 +yuvj422p 2e70ab700851d12a773f926bb1785235 +yuvj440p 93319f9c8a02ee793966fae40f7e42fd +yuvj444p 81a124fffe0214bee5205c90ae0dd201 diff --git a/tests/ref/lavfi/transpose b/tests/ref/lavfi/transpose index e292f8ca9c..1785e3ac08 100644 --- a/tests/ref/lavfi/transpose +++ b/tests/ref/lavfi/transpose @@ -1 +1 @@ -transpose 7ab8e0774838c7de11c610e0750de64b +transpose 75d71957db820f657ccc46c14da6c8e9 diff --git a/tests/ref/lavfi/unsharp b/tests/ref/lavfi/unsharp index c56325996c..ad064aea8a 100644 --- a/tests/ref/lavfi/unsharp +++ b/tests/ref/lavfi/unsharp @@ -1 +1 @@ -unsharp da200fd29ad94878fe24de852877a353 +unsharp 7d72d2ab7b7f60159c822a097e01068b diff --git a/tests/ref/lavfi/vflip b/tests/ref/lavfi/vflip index 8fe4233ffb..ee492477a4 100644 --- a/tests/ref/lavfi/vflip +++ b/tests/ref/lavfi/vflip @@ -1 +1 @@ -vflip b094859d64cdb8db951a1f664c316f62 +vflip c59b35b82b5a195128736021913b35a4 diff --git a/tests/ref/lavfi/vflip_crop b/tests/ref/lavfi/vflip_crop index f2ece1f1f8..43c944adad 100644 --- a/tests/ref/lavfi/vflip_crop +++ b/tests/ref/lavfi/vflip_crop @@ -1 +1 @@ -vflip_crop 53f8135938538c3484e38166e50c2d76 +vflip_crop cd56578bb7e89ca0853467dfecab244b diff --git a/tests/ref/lavfi/vflip_vflip b/tests/ref/lavfi/vflip_vflip index e4d7dfb860..f401fc7720 100644 --- a/tests/ref/lavfi/vflip_vflip +++ b/tests/ref/lavfi/vflip_vflip @@ -1 +1 @@ -vflip_vflip 3b9efd4c33f3085a50a51dfbc5a4a5d1 +vflip_vflip 61fffd2d8425759a33ae07e718d0242d diff --git a/tests/ref/seek/lavf_nut b/tests/ref/seek/lavf_nut index de346ece18..ef47ceb5fb 100644 --- a/tests/ref/seek/lavf_nut +++ b/tests/ref/seek/lavf_nut @@ -1,53 +1,53 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 333 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 339 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 -ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 -ret: 0 st: 0 flags:1 ts:-0.320000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:0 ts: 0.788340 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 ts:-0.317500 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271225 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271225 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 -ret: 0 st: 0 flags:0 ts: 2.160000 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 -ret: 0 st: 0 flags:1 ts: 1.040000 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:0 ts: 2.153340 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 ts: 1.047500 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 333 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 339 size: 208 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271225 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 -ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 -ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:0 ts:-0.481660 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 +ret: 0 st: 0 flags:1 ts: 2.412500 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271225 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos: 71888 size: 209 +ret: 0 st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos: 71901 size: 209 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 -ret: 0 st: 0 flags:0 ts: 0.880000 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 -ret: 0 st: 0 flags:1 ts:-0.240000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 +ret: 0 st: 0 flags:1 ts:-0.222500 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 ret: 0 st: 1 flags:0 ts: 2.671678 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271225 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271225 size: 209 +ret: 0 st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271259 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos: 146412 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146434 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 559 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos: 567 size: 27837 |