From dfea78ed5bfd0b14916c85107450f18662f3f530 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 7 Mar 2017 19:15:28 -0500 Subject: [PATCH] fate: Do not report side data size This field is of little value and should not interfere with testing there rest of the side data interface since sizes can be different on multiple architectures. --- ffprobe.c | 2 -- tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- .../ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 42 +++++++++++----------- tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 20 +++++------ tests/ref/fate/matroska-spherical-mono | 2 -- tests/ref/fate/mov-displaymatrix | 1 - tests/ref/fate/mov-spherical-mono | 2 -- tests/ref/fate/mov-zombie | 2 +- 9 files changed, 34 insertions(+), 41 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index c85c3a104b..9f6c1f0be0 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1777,7 +1777,6 @@ static void print_pkt_side_data(WriterContext *w, writer_print_section_header(w, SECTION_ID_STREAM_SIDE_DATA); print_str("side_data_type", name ? name : "unknown"); - print_int("side_data_size", sd->size); if (sd->type == AV_PKT_DATA_DISPLAYMATRIX && sd->size >= 9*4) { writer_print_integers(w, "displaymatrix", sd->data, 9, " %11d", 3, 4, 1); print_int("rotation", av_display_rotation_get((int32_t *)sd->data)); @@ -1970,7 +1969,6 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA); name = av_frame_side_data_name(sd->type); print_str("side_data_type", name ? name : "unknown"); - print_int("side_data_size", sd->size); if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) { writer_print_integers(w, "displaymatrix", sd->data, 9, " %11d", 3, 4, 1); print_int("rotation", av_display_rotation_get((int32_t *)sd->data)); diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf b/tests/ref/fate/concat-demuxer-extended-lavf-mxf index f6b1010bea..c47f14faa1 100644 --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf @@ -1 +1 @@ -32fe9ae5b89c7802c804ac51f62d89cb *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe +7e53f4c5cb0c9afda2771c9f0c697d9c *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 index 6d84589fbd..75d386e3c1 100644 --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 @@ -1 +1 @@ -0724a00f35550e4ae1e87240a5c95050 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe +44810fc2eeee0072d9d7011b0d2afe59 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf index d71acbe7b1..1174a1e183 100644 --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf @@ -79,46 +79,46 @@ audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|501248|K_ video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|13350|505856|__ audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|519680|K_ video|0|25|1.000000|24|0.960000|1|0.040000|N/A|N/A|24801|6144|K_|1 -Strings Metadata|8 +Strings Metadata audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|31232|K_|1 -Strings Metadata|8 +Strings Metadata video|0|28|1.120000|25|1.000000|1|0.040000|N/A|N/A|16743|35840|__|1 -Strings Metadata|8 +Strings Metadata audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|52736|K_|1 -Strings Metadata|8 +Strings Metadata video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|13812|57344|__|1 -Strings Metadata|8 +Strings Metadata audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|71680|K_|1 -Strings Metadata|8 +Strings Metadata video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|13607|76288|__|1 -Strings Metadata|8 +Strings Metadata audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|90112|K_|1 -Strings Metadata|8 +Strings Metadata video|0|31|1.240000|28|1.120000|1|0.040000|N/A|N/A|16158|94720|__|1 -Strings Metadata|8 +Strings Metadata audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|111104|K_|1 -Strings Metadata|8 +Strings Metadata video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|13943|115712|__|1 -Strings Metadata|8 +Strings Metadata audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|3840|130048|K_|1 -Strings Metadata|8 +Strings Metadata video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|11223|134656|__|1 -Strings Metadata|8 +Strings Metadata audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|3840|145920|K_|1 -Strings Metadata|8 +Strings Metadata video|0|34|1.360000|31|1.240000|1|0.040000|N/A|N/A|20298|150528|__|1 -Strings Metadata|8 +Strings Metadata audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|3840|171008|K_|1 -Strings Metadata|8 +Strings Metadata video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|13341|175616|__|1 -Strings Metadata|8 +Strings Metadata audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|3840|189440|K_|1 -Strings Metadata|8 +Strings Metadata video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|12362|194048|__|1 -Strings Metadata|8 +Strings Metadata audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|206848|K_|1 -Strings Metadata|8 +Strings Metadata video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|211456|K_|1 -Strings Metadata|8 +Strings Metadata 0|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001 1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001 diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 index 4c78bb2ab9..bd0e5e2a74 100644 --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 @@ -59,24 +59,24 @@ audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|7680|5055488|K_ video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|150000|5117952|K_ audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|7680|5268480|K_ video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|150000|1071104|K_|1 -Strings Metadata|8 +Strings Metadata audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|7680|1221632|K_|1 -Strings Metadata|8 +Strings Metadata video|0|31|1.240000|31|1.240000|1|0.040000|N/A|N/A|150000|1284096|K_|1 -Strings Metadata|8 +Strings Metadata audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|7680|1434624|K_|1 -Strings Metadata|8 +Strings Metadata video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|150000|1497088|K_|1 -Strings Metadata|8 +Strings Metadata audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|7680|1647616|K_|1 -Strings Metadata|8 +Strings Metadata video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|150000|1710080|K_|1 -Strings Metadata|8 +Strings Metadata audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|7680|1860608|K_|1 -Strings Metadata|8 +Strings Metadata video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1923072|K_|1 -Strings Metadata|8 +Strings Metadata audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2073600|K_|1 -Strings Metadata|8 +Strings Metadata 0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001 1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001 diff --git a/tests/ref/fate/matroska-spherical-mono b/tests/ref/fate/matroska-spherical-mono index a70d879f0e..bd57d94514 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-spherical-mono @@ -1,13 +1,11 @@ [STREAM] [SIDE_DATA] side_data_type=Stereo 3D -side_data_size=8 type=2D inverted=0 [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping -side_data_size=56 projection=tiled equirectangular bound_left=148 bound_top=73 diff --git a/tests/ref/fate/mov-displaymatrix b/tests/ref/fate/mov-displaymatrix index 86139fc969..ac09e2ac04 100644 --- a/tests/ref/fate/mov-displaymatrix +++ b/tests/ref/fate/mov-displaymatrix @@ -1,7 +1,6 @@ [STREAM] [SIDE_DATA] side_data_type=Display Matrix -side_data_size=36 displaymatrix= 00000000: 0 131072 0 00000001: -65536 0 0 diff --git a/tests/ref/fate/mov-spherical-mono b/tests/ref/fate/mov-spherical-mono index a70d879f0e..bd57d94514 100644 --- a/tests/ref/fate/mov-spherical-mono +++ b/tests/ref/fate/mov-spherical-mono @@ -1,13 +1,11 @@ [STREAM] [SIDE_DATA] side_data_type=Stereo 3D -side_data_size=8 type=2D inverted=0 [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping -side_data_size=56 projection=tiled equirectangular bound_left=148 bound_top=73 diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie index 42e3a6f29e..522417dce7 100644 --- a/tests/ref/fate/mov-zombie +++ b/tests/ref/fate/mov-zombie @@ -130,4 +130,4 @@ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2. packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=580|pos=101820|flags=__ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=191626|pkt_pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_time_base=212521/12744000|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|has_b_frames=0|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|timecode=N/A|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|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|disposition:timed_thumbnails=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Alias Data Handler|tag:encoder=H.264 -side_data|side_data_type=Display Matrix|side_data_size=36|displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|rotation=0 +side_data|side_data_type=Display Matrix|displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|rotation=0 -- 2.12.0