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

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

Issue 10837116: Update EME MediaKeyNeededEvent.initData for ISO BMFF to match current spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Overzealous statement terminator is overzealous Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MP4_BOX_DEFINITIONS_H_ 5 #ifndef MEDIA_MP4_BOX_DEFINITIONS_H_
6 #define MEDIA_MP4_BOX_DEFINITIONS_H_ 6 #define MEDIA_MP4_BOX_DEFINITIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 25 matching lines...) Expand all
36 DECLARE_BOX_METHODS(FileType); 36 DECLARE_BOX_METHODS(FileType);
37 37
38 FourCC major_brand; 38 FourCC major_brand;
39 uint32 minor_version; 39 uint32 minor_version;
40 }; 40 };
41 41
42 struct MEDIA_EXPORT ProtectionSystemSpecificHeader : Box { 42 struct MEDIA_EXPORT ProtectionSystemSpecificHeader : Box {
43 DECLARE_BOX_METHODS(ProtectionSystemSpecificHeader); 43 DECLARE_BOX_METHODS(ProtectionSystemSpecificHeader);
44 44
45 std::vector<uint8> system_id; 45 std::vector<uint8> system_id;
46 std::vector<uint8> data; 46 std::vector<uint8> raw_box;
47 }; 47 };
48 48
49 struct MEDIA_EXPORT SampleAuxiliaryInformationOffset : Box { 49 struct MEDIA_EXPORT SampleAuxiliaryInformationOffset : Box {
50 DECLARE_BOX_METHODS(SampleAuxiliaryInformationOffset); 50 DECLARE_BOX_METHODS(SampleAuxiliaryInformationOffset);
51 51
52 std::vector<uint64> offsets; 52 std::vector<uint64> offsets;
53 }; 53 };
54 54
55 struct MEDIA_EXPORT SampleAuxiliaryInformationSize : Box { 55 struct MEDIA_EXPORT SampleAuxiliaryInformationSize : Box {
56 DECLARE_BOX_METHODS(SampleAuxiliaryInformationSize); 56 DECLARE_BOX_METHODS(SampleAuxiliaryInformationSize);
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 std::vector<TrackFragment> tracks; 342 std::vector<TrackFragment> tracks;
343 std::vector<ProtectionSystemSpecificHeader> pssh; 343 std::vector<ProtectionSystemSpecificHeader> pssh;
344 }; 344 };
345 345
346 #undef DECLARE_BOX 346 #undef DECLARE_BOX
347 347
348 } // namespace mp4 348 } // namespace mp4
349 } // namespace media 349 } // namespace media
350 350
351 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_ 351 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « no previous file | media/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698