Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: media/formats/mp4/box_definitions.h

Issue 1735003004: Implement reading of media track info from WebM and MP4 containers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@demuxer-tracks2
Patch Set: rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/formats/mp4/box_definitions.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 5 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 struct MEDIA_EXPORT Edit : Box { 190 struct MEDIA_EXPORT Edit : Box {
191 DECLARE_BOX_METHODS(Edit); 191 DECLARE_BOX_METHODS(Edit);
192 192
193 EditList list; 193 EditList list;
194 }; 194 };
195 195
196 struct MEDIA_EXPORT HandlerReference : Box { 196 struct MEDIA_EXPORT HandlerReference : Box {
197 DECLARE_BOX_METHODS(HandlerReference); 197 DECLARE_BOX_METHODS(HandlerReference);
198 198
199 TrackType type; 199 TrackType type;
200 std::string name;
200 }; 201 };
201 202
202 struct MEDIA_EXPORT AVCDecoderConfigurationRecord : Box { 203 struct MEDIA_EXPORT AVCDecoderConfigurationRecord : Box {
203 DECLARE_BOX_METHODS(AVCDecoderConfigurationRecord); 204 DECLARE_BOX_METHODS(AVCDecoderConfigurationRecord);
204 205
205 // Parses AVCDecoderConfigurationRecord data encoded in |data|. 206 // Parses AVCDecoderConfigurationRecord data encoded in |data|.
206 // Note: This method is intended to parse data outside the MP4StreamParser 207 // Note: This method is intended to parse data outside the MP4StreamParser
207 // context and therefore the box header is not expected to be present 208 // context and therefore the box header is not expected to be present
208 // in |data|. 209 // in |data|.
209 // Returns true if |data| was successfully parsed. 210 // Returns true if |data| was successfully parsed.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // including some that are required to be present in the BMFF spec. This 304 // including some that are required to be present in the BMFF spec. This
304 // includes the 'stts', 'stsc', and 'stco' boxes, which must contain no 305 // includes the 'stts', 'stsc', and 'stco' boxes, which must contain no
305 // samples in order to be compliant files. 306 // samples in order to be compliant files.
306 SampleDescription description; 307 SampleDescription description;
307 SampleGroupDescription sample_group_description; 308 SampleGroupDescription sample_group_description;
308 }; 309 };
309 310
310 struct MEDIA_EXPORT MediaHeader : Box { 311 struct MEDIA_EXPORT MediaHeader : Box {
311 DECLARE_BOX_METHODS(MediaHeader); 312 DECLARE_BOX_METHODS(MediaHeader);
312 313
314 std::string language() const;
315
313 uint64_t creation_time; 316 uint64_t creation_time;
314 uint64_t modification_time; 317 uint64_t modification_time;
315 uint32_t timescale; 318 uint32_t timescale;
316 uint64_t duration; 319 uint64_t duration;
320 uint16_t language_code;
317 }; 321 };
318 322
319 struct MEDIA_EXPORT MediaInformation : Box { 323 struct MEDIA_EXPORT MediaInformation : Box {
320 DECLARE_BOX_METHODS(MediaInformation); 324 DECLARE_BOX_METHODS(MediaInformation);
321 325
322 SampleTable sample_table; 326 SampleTable sample_table;
323 }; 327 };
324 328
325 struct MEDIA_EXPORT Media : Box { 329 struct MEDIA_EXPORT Media : Box {
326 DECLARE_BOX_METHODS(Media); 330 DECLARE_BOX_METHODS(Media);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 std::vector<TrackFragment> tracks; 473 std::vector<TrackFragment> tracks;
470 std::vector<ProtectionSystemSpecificHeader> pssh; 474 std::vector<ProtectionSystemSpecificHeader> pssh;
471 }; 475 };
472 476
473 #undef DECLARE_BOX 477 #undef DECLARE_BOX
474 478
475 } // namespace mp4 479 } // namespace mp4
476 } // namespace media 480 } // namespace media
477 481
478 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 482 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/formats/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698