Unified · Split
| @@ -2100,6 +2100,7 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, · 2099 unmodified lines | ||
| 2100 | 2100 | uint8_t codec_name[32] = { 0 }; |
| 2101 | 2101 | int64_t stsd_start; |
| 2102 | 2102 | unsigned int len; |
| 2103 | + uint32_t id = 0; | |
| 2103 | 2104 | |
| 2104 | 2105 | /* The first 16 bytes of the video sample description are already |
| 2105 | 2106 | * read in ff_mov_read_stsd_entries() */ |
| @@ -2107,7 +2108,8 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, · 1 unmodified line | ||
| 2107 | 2108 | |
| 2108 | 2109 | avio_rb16(pb); /* version */ |
| 2109 | 2110 | avio_rb16(pb); /* revision level */ |
| 2110 | − avio_rb32(pb); /* vendor */ | |
| 2111 | + id = avio_rl32(pb); /* vendor */ | |
| 2112 | + av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0); | |
| 2111 | 2113 | avio_rb32(pb); /* temporal quality */ |
| 2112 | 2114 | avio_rb32(pb); /* spatial quality */ |
| 2113 | 2115 | |
| @@ -2155,10 +2157,12 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb, · 41 unmodified lines | ||
| 2155 | 2157 | { |
| 2156 | 2158 | int bits_per_sample, flags; |
| 2157 | 2159 | uint16_t version = avio_rb16(pb); |
| 2160 | + uint32_t id = 0; | |
| 2158 | 2161 | AVDictionaryEntry *compatible_brands = av_dict_get(c->fc->metadata, "compatible_brands", NULL, AV_DICT_MATCH_CASE); |
| 2159 | 2162 | |
| 2160 | 2163 | avio_rb16(pb); /* revision level */ |
| 2161 | − avio_rb32(pb); /* vendor */ | |
| 2164 | + id = avio_rl32(pb); /* vendor */ | |
| 2165 | + av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0); | |
| 2162 | 2166 | |
| 2163 | 2167 | st->codecpar->channels = avio_rb16(pb); /* channel count */ |
| 2164 | 2168 | st->codecpar->bits_per_coded_sample = avio_rb16(pb); /* sample size */ |
| @@ -69,5 +69,6 @@ DISPOSITION:attached_pic=0 · 68 unmodified lines | ||
| 69 | 69 | DISPOSITION:timed_thumbnails=0 |
| 70 | 70 | TAG:language=eng |
| 71 | 71 | TAG:handler_name=Module de gestion video |
| 72 | +TAG:vendor_id=FFMP | |
| 72 | 73 | TAG:encoder=HAPAlpha Only |
| 73 | 74 | [/STREAM] |
| @@ -69,5 +69,6 @@ DISPOSITION:attached_pic=0 · 68 unmodified lines | ||
| 69 | 69 | DISPOSITION:timed_thumbnails=0 |
| 70 | 70 | TAG:language=eng |
| 71 | 71 | TAG:handler_name=Module de gestion video |
| 72 | +TAG:vendor_id=FFMP | |
| 72 | 73 | TAG:encoder=HAPQ |
| 73 | 74 | [/STREAM] |
| @@ -194,5 +194,5 @@ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2. · 193 unmodified lines | ||
| 194 | 194 | 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=__ |
| 195 | 195 | 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|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleftside_data|side_data_type=H.26[45] User Data Unregistered SEI message |
| 196 | 196 | |
| 197 | −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|closed_captions=0|has_b_frames=1|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 Video Media Handler|tag:encoder=H.264 | |
| 197 | +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|closed_captions=0|has_b_frames=1|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 Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264 | |
| 198 | 198 | side_data|side_data_type=Display Matrix|displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|rotation=0 |
| @@ -1,5 +1,5 @@ | ||
| 1 | −fde8903c4df0ba8235dafcfd8a2f368c *tests/data/fate/rgb24-mkv.matroska | |
| 2 | −58216 tests/data/fate/rgb24-mkv.matroska | |
| 1 | +6244b8750d4155d3c9357bab26396ef9 *tests/data/fate/rgb24-mkv.matroska | |
| 2 | +58245 tests/data/fate/rgb24-mkv.matroska | |
| 3 | 3 | #tb 0: 1/10 |
| 4 | 4 | #media_type 0: video |
| 5 | 5 | #codec_id 0: rawvideo |