[FFmpeg-cvslog] tests: update fate-ffprobe test to make use of -bitexact flag
Stefano Sabatini
git at videolan.org
Sat Sep 22 09:43:43 CEST 2012
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Sep 22 09:23:13 2012 +0200| [ab4ee9fd5ed8a875f1e0e5509cccb4bff79dcc6a] | committer: Stefano Sabatini
tests: update fate-ffprobe test to make use of -bitexact flag
Should fix tests with --enable-small.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab4ee9fd5ed8a875f1e0e5509cccb4bff79dcc6a
---
tests/fate/ffprobe.mak | 2 +-
tests/ref/fate/ffprobe_compact | 8 ++++----
tests/ref/fate/ffprobe_csv | 8 ++++----
tests/ref/fate/ffprobe_default | 4 ----
tests/ref/fate/ffprobe_flat | 4 ----
tests/ref/fate/ffprobe_ini | 4 ----
tests/ref/fate/ffprobe_json | 4 ----
tests/ref/fate/ffprobe_xml | 8 ++++----
8 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak
index 734c24b..cf20185 100644
--- a/tests/fate/ffprobe.mak
+++ b/tests/fate/ffprobe.mak
@@ -1,5 +1,5 @@
FFPROBE_TEST_FILE=tests/data/ffprobe-test.nut
-FFPROBE_COMMAND=ffprobe$(EXESUF) -show_streams -show_packets -show_format -show_frames $(FFPROBE_TEST_FILE)
+FFPROBE_COMMAND=ffprobe$(EXESUF) -show_streams -show_packets -show_format -show_frames -bitexact $(FFPROBE_TEST_FILE)
FATE_FFPROBE += fate-ffprobe_compact
fate-ffprobe_compact: $(FFPROBE_TEST_FILE)
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
index 6c5b94f..4d2e448 100644
--- a/tests/ref/fate/ffprobe_compact
+++ b/tests/ref/fate/ffprobe_compact
@@ -26,7 +26,7 @@ packet|codec_type=video|stream_index=1|pts=3|pts_time=0.120000|dts=3|dts_time=0.
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=794127|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=1024549|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=1024549|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|codec_long_name=PCM signed 16-bit little-endian|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=[1][0][0][0]|codec_tag=0x0001|default=0|forced=0|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=527312|duration=11.957188|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6
-stream|index=1|codec_name=rawvideo|codec_long_name=raw video|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|default=0|forced=0|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|attached_pic=0|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
-stream|index=2|codec_name=rawvideo|codec_long_name=raw video|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|default=0|forced=0|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|attached_pic=0|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
-format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|format_long_name=NUT|start_time=0.000000|duration=11.960000|size=1054624|bit_rate=705434|tag:title=ffprobe test file|tag:comment='A comment wih CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
+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|default=0|forced=0|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=527312|duration=11.957188|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6
+stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|default=0|forced=0|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|attached_pic=0|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
+stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|default=0|forced=0|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|attached_pic=0|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
+format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=11.960000|size=1054624|bit_rate=705434|tag:title=ffprobe test file|tag:comment='A comment wih 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 413fd91..a48ccde 100644
--- a/tests/ref/fate/ffprobe_csv
+++ b/tests/ref/fate/ffprobe_csv
@@ -26,7 +26,7 @@ packet,video,1,3,0.120000,3,0.120000,1,0.040000,N/A,N/A,230400,794127,K
frame,video,1,3,0.120000,3,0.120000,1,0.040000,794127,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,1024549,K
frame,video,1,3,0.120000,3,0.120000,1,0.040000,1024549,100,100,rgb24,1:1,I,0,0,0,0,0,0
-stream,0,pcm_s16le,PCM signed 16-bit little-endian,unknown,audio,1/44100,[1][0][0][0],0x0001,0,0,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527312,11.957188,705600,N/A,6,6
-stream,1,rawvideo,raw video,unknown,video,1/25,RGB[24],0x18424752,0,0,320,240,0,1:1,4:3,rgb24,-99,N/A,0,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4
-stream,2,rawvideo,raw video,unknown,video,1/25,RGB[24],0x18424752,0,0,100,100,0,1:1,1:1,rgb24,-99,N/A,0,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4
-format,tests/data/ffprobe-test.nut,3,nut,NUT,0.000000,11.960000,1054624,705434,ffprobe test file,"'A comment wih CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
+stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,0,0,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527312,11.957188,705600,N/A,6,6
+stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,0,0,320,240,0,1:1,4:3,rgb24,-99,N/A,0,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4
+stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,0,0,100,100,0,1:1,1:1,rgb24,-99,N/A,0,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4
+format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.960000,1054624,705434,ffprobe test file,"'A comment wih 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 4c967a7..907aadd 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -477,7 +477,6 @@ reference=0
[STREAM]
index=0
codec_name=pcm_s16le
-codec_long_name=PCM signed 16-bit little-endian
profile=unknown
codec_type=audio
codec_time_base=1/44100
@@ -505,7 +504,6 @@ nb_read_packets=6
[STREAM]
index=1
codec_name=rawvideo
-codec_long_name=raw video
profile=unknown
codec_type=video
codec_time_base=1/25
@@ -538,7 +536,6 @@ nb_read_packets=4
[STREAM]
index=2
codec_name=rawvideo
-codec_long_name=raw video
profile=unknown
codec_type=video
codec_time_base=1/25
@@ -572,7 +569,6 @@ nb_read_packets=4
filename=tests/data/ffprobe-test.nut
nb_streams=3
format_name=nut
-format_long_name=NUT
start_time=0.000000
duration=11.960000
size=1054624
diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat
index 5282246..2e2e7b4 100644
--- a/tests/ref/fate/ffprobe_flat
+++ b/tests/ref/fate/ffprobe_flat
@@ -420,7 +420,6 @@ packets_and_frames.frame.13.repeat_pict=0
packets_and_frames.frame.13.reference=0
streams.stream.0.index=0
streams.stream.0.codec_name="pcm_s16le"
-streams.stream.0.codec_long_name="PCM signed 16-bit little-endian"
streams.stream.0.profile="unknown"
streams.stream.0.codec_type="audio"
streams.stream.0.codec_time_base="1/44100"
@@ -446,7 +445,6 @@ streams.stream.0.nb_read_frames="6"
streams.stream.0.nb_read_packets="6"
streams.stream.1.index=1
streams.stream.1.codec_name="rawvideo"
-streams.stream.1.codec_long_name="raw video"
streams.stream.1.profile="unknown"
streams.stream.1.codec_type="video"
streams.stream.1.codec_time_base="1/25"
@@ -477,7 +475,6 @@ streams.stream.1.nb_read_frames="4"
streams.stream.1.nb_read_packets="4"
streams.stream.2.index=2
streams.stream.2.codec_name="rawvideo"
-streams.stream.2.codec_long_name="raw video"
streams.stream.2.profile="unknown"
streams.stream.2.codec_type="video"
streams.stream.2.codec_time_base="1/25"
@@ -509,7 +506,6 @@ streams.stream.2.nb_read_packets="4"
format.filename="tests/data/ffprobe-test.nut"
format.nb_streams=3
format.format_name="nut"
-format.format_long_name="NUT"
format.start_time="0.000000"
format.duration="11.960000"
format.size="1054624"
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index 6a925b7..ddfb169 100644
--- a/tests/ref/fate/ffprobe_ini
+++ b/tests/ref/fate/ffprobe_ini
@@ -479,7 +479,6 @@ reference=0
[streams.stream.0]
index=0
codec_name=pcm_s16le
-codec_long_name=PCM signed 16-bit little-endian
profile=unknown
codec_type=audio
codec_time_base=1/44100
@@ -507,7 +506,6 @@ nb_read_packets=6
[streams.stream.1]
index=1
codec_name=rawvideo
-codec_long_name=raw video
profile=unknown
codec_type=video
codec_time_base=1/25
@@ -540,7 +538,6 @@ nb_read_packets=4
[streams.stream.2]
index=2
codec_name=rawvideo
-codec_long_name=raw video
profile=unknown
codec_type=video
codec_time_base=1/25
@@ -574,7 +571,6 @@ nb_read_packets=4
filename=tests/data/ffprobe-test.nut
nb_streams=3
format_name=nut
-format_long_name=NUT
start_time=0.000000
duration=11.960000
size=1054624
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
index 05f03a8..23e72df 100644
--- a/tests/ref/fate/ffprobe_json
+++ b/tests/ref/fate/ffprobe_json
@@ -475,7 +475,6 @@
{
"index": 0,
"codec_name": "pcm_s16le",
- "codec_long_name": "PCM signed 16-bit little-endian",
"codec_type": "audio",
"codec_time_base": "1/44100",
"codec_tag_string": "[1][0][0][0]",
@@ -500,7 +499,6 @@
{
"index": 1,
"codec_name": "rawvideo",
- "codec_long_name": "raw video",
"codec_type": "video",
"codec_time_base": "1/25",
"codec_tag_string": "RGB[24]",
@@ -528,7 +526,6 @@
{
"index": 2,
"codec_name": "rawvideo",
- "codec_long_name": "raw video",
"codec_type": "video",
"codec_time_base": "1/25",
"codec_tag_string": "RGB[24]",
@@ -558,7 +555,6 @@
"filename": "tests/data/ffprobe-test.nut",
"nb_streams": 3,
"format_name": "nut",
- "format_long_name": "NUT",
"start_time": "0.000000",
"duration": "11.960000",
"size": "1054624",
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
index 01323af..7376726 100644
--- a/tests/ref/fate/ffprobe_xml
+++ b/tests/ref/fate/ffprobe_xml
@@ -32,12 +32,12 @@
</packets_and_frames>
<streams>
- <stream index="0" codec_name="pcm_s16le" codec_long_name="PCM signed 16-bit little-endian" codec_type="audio" codec_time_base="1/44100" codec_tag_string="[1][0][0][0]" codec_tag="0x0001" default="0" forced="0" 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="527312" duration="11.957188" bit_rate="705600" nb_read_frames="6" nb_read_packets="6"/>
- <stream index="1" codec_name="rawvideo" codec_long_name="raw video" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" default="0" forced="0" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" attached_pic="0" 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_long_name="raw video" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" default="0" forced="0" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" attached_pic="0" 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="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="[1][0][0][0]" codec_tag="0x0001" default="0" forced="0" 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="527312" duration="11.957188" bit_rate="705600" nb_read_frames="6" nb_read_packets="6"/>
+ <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" default="0" forced="0" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" attached_pic="0" 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/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" default="0" forced="0" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" attached_pic="0" 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"/>
</streams>
- <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" format_long_name="NUT" start_time="0.000000" duration="11.960000" size="1054624" bit_rate="705434">
+ <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" start_time="0.000000" duration="11.960000" size="1054624" bit_rate="705434">
<tag key="title" value="ffprobe test file"/>
<tag key="comment" value="'A comment wih CSV, XML & JSON special chars': <tag value="x">"/>
<tag key="comment2" value="I ♥ Üñîçød€"/>
More information about the ffmpeg-cvslog
mailing list