[FFmpeg-devel] [PATCH 3/3] Update the ffprobe fates
Paul B Mahol
onemda at gmail.com
Mon Jul 22 13:55:12 CEST 2013
On 7/22/13, Florent Tribouilloy <florent.tribouilloy at smartjog.com> wrote:
> Signed-off-by: Florent Tribouilloy <florent.tribouilloy at smartjog.com>
> ---
> tests/ref/fate/ffprobe_compact | 2 +-
> tests/ref/fate/ffprobe_csv | 2 +-
> tests/ref/fate/ffprobe_default | 1 +
> tests/ref/fate/ffprobe_flat | 1 +
> tests/ref/fate/ffprobe_ini | 1 +
> tests/ref/fate/ffprobe_json | 1 +
> tests/ref/fate/ffprobe_xml | 2 +-
> 7 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
> index 409ac9c..04d8ce4 100644
> --- a/tests/ref/fate/ffprobe_compact
> +++ b/tests/ref/fate/ffprobe_compact
> @@ -29,4 +29,4 @@
> frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=61
> stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc^2
> stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt
> stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0
> -format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=0.120000|size=1054812|bit_rate=70320800|tag:title=ffprobe
> test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag
> value="x">|tag:comment2=I cH- Uenic,o/dEUR
> +format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054812|bit_rate=70320800|tag:title=ffprobe
> test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag
> value="x">|tag:comment2=I cH- Uenic,o/dEUR
> diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv
> index 0094c39..a11b321 100644
> --- a/tests/ref/fate/ffprobe_csv
> +++ b/tests/ref/fate/ffprobe_csv
> @@ -29,4 +29,4 @@
> frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb2
> stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc^2
> stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt
> stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0
> -format,tests/data/ffprobe-test.nut,3,nut,0.000000,0.120000,1054812,70320800,ffprobe
> test file,"'A comment with CSV, XML & JSON special chars': <tag
> value=""x"">",I cH- Uenic,o/dEUR
> +format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054812,70320800,ffprobe
> test file,"'A comment with CSV, XML & JSON special chars': <tag
> value=""x"">",I cH- Uenic,o/dEUR
> diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
> index 9f523fd..f56bd8d 100644
> --- a/tests/ref/fate/ffprobe_default
> +++ b/tests/ref/fate/ffprobe_default
> @@ -602,6 +602,7 @@ DISPOSITION:attached_pic=0
> [FORMAT]
> filename=tests/data/ffprobe-test.nut
> nb_streams=3
> +nb_programs=0
> format_name=nut
> start_time=0.000000
> duration=0.120000
> diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat
> index c08ca0f..7cb9c3e 100644
> --- a/tests/ref/fate/ffprobe_flat
> +++ b/tests/ref/fate/ffprobe_flat
> @@ -539,6 +539,7 @@ streams.stream.2.disposition.clean_effects=0
> streams.stream.2.disposition.attached_pic=0
> format.filename="tests/data/ffprobe-test.nut"
> format.nb_streams=3
> +format.nb_programs=0
> format.format_name="nut"
> format.start_time="0.000000"
> format.duration="0.120000"
> diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
> index 1bc46d0..c0254dc 100644
> --- a/tests/ref/fate/ffprobe_ini
> +++ b/tests/ref/fate/ffprobe_ini
> @@ -614,6 +614,7 @@ attached_pic=0
> [format]
> filename=tests/data/ffprobe-test.nut
> nb_streams=3
> +nb_programs=0
> format_name=nut
> start_time=0.000000
> duration=0.120000
> diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
> index fc3d22e..ee5ddb9 100644
> --- a/tests/ref/fate/ffprobe_json
> +++ b/tests/ref/fate/ffprobe_json
> @@ -584,6 +584,7 @@
> "format": {
> "filename": "tests/data/ffprobe-test.nut",
> "nb_streams": 3,
> + "nb_programs": 0,
> "format_name": "nut",
> "start_time": "0.000000",
> "duration": "0.120000",
> diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
> index 1f2715a..410f250 100644
> --- a/tests/ref/fate/ffprobe_xml
> +++ b/tests/ref/fate/ffprobe_xml
> @@ -46,7 +46,7 @@
> </stream>
> </streams>
>
> - <format filename="tests/data/ffprobe-test.nut" nb_streams="3"
> format_name="nut" start_time="0.000000" duration="0.120000" size="1054812"
> bit_rate="70320800">
> + <format filename="tests/data/ffprobe-test.nut" nb_streams="3"
> nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000"
> size="1054812" bit_rate="70320800">
> <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 cH- Uenic,o/dEUR"/>
> --
> 1.7.10.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Wrong, this should be part of same commit that change such results.
More information about the ffmpeg-devel
mailing list