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

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

Issue 1718773002: Parse ELNG box in MP4 container Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « no previous file | 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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 308
309 std::string language() const; 309 std::string language() const;
310 310
311 uint64_t creation_time; 311 uint64_t creation_time;
312 uint64_t modification_time; 312 uint64_t modification_time;
313 uint32_t timescale; 313 uint32_t timescale;
314 uint64_t duration; 314 uint64_t duration;
315 uint16_t language_code; 315 uint16_t language_code;
316 }; 316 };
317 317
318 struct MEDIA_EXPORT ExtendedLanguageTag : Box {
319 DECLARE_BOX_METHODS(ExtendedLanguageTag);
320 std::string language_tag;
321 };
322
318 struct MEDIA_EXPORT MediaInformation : Box { 323 struct MEDIA_EXPORT MediaInformation : Box {
319 DECLARE_BOX_METHODS(MediaInformation); 324 DECLARE_BOX_METHODS(MediaInformation);
320 325
321 SampleTable sample_table; 326 SampleTable sample_table;
322 }; 327 };
323 328
324 struct MEDIA_EXPORT Media : Box { 329 struct MEDIA_EXPORT Media : Box {
325 DECLARE_BOX_METHODS(Media); 330 DECLARE_BOX_METHODS(Media);
326 331
327 MediaHeader header; 332 MediaHeader header;
328 HandlerReference handler; 333 HandlerReference handler;
334 ExtendedLanguageTag extended_language_tag;
329 MediaInformation information; 335 MediaInformation information;
330 }; 336 };
331 337
332 struct MEDIA_EXPORT Track : Box { 338 struct MEDIA_EXPORT Track : Box {
333 DECLARE_BOX_METHODS(Track); 339 DECLARE_BOX_METHODS(Track);
334 340
335 TrackHeader header; 341 TrackHeader header;
336 Media media; 342 Media media;
337 Edit edit; 343 Edit edit;
338 }; 344 };
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 std::vector<TrackFragment> tracks; 474 std::vector<TrackFragment> tracks;
469 std::vector<ProtectionSystemSpecificHeader> pssh; 475 std::vector<ProtectionSystemSpecificHeader> pssh;
470 }; 476 };
471 477
472 #undef DECLARE_BOX 478 #undef DECLARE_BOX
473 479
474 } // namespace mp4 480 } // namespace mp4
475 } // namespace media 481 } // namespace media
476 482
477 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 483 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « no previous file | media/formats/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698