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

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

Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Satisfy mac_rel buildbot Created 8 years, 5 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/mp4/avc_unittest.cc ('k') | 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 TrackType type; 211 TrackType type;
212 std::vector<VideoSampleEntry> video_entries; 212 std::vector<VideoSampleEntry> video_entries;
213 std::vector<AudioSampleEntry> audio_entries; 213 std::vector<AudioSampleEntry> audio_entries;
214 }; 214 };
215 215
216 struct MEDIA_EXPORT SampleTable : Box { 216 struct MEDIA_EXPORT SampleTable : Box {
217 DECLARE_BOX_METHODS(SampleTable); 217 DECLARE_BOX_METHODS(SampleTable);
218 218
219 // Media Source specific: we ignore many of the sub-boxes in this box, 219 // Media Source specific: we ignore many of the sub-boxes in this box,
220 // including some that are required to be present in the BMFF spec. 220 // including some that are required to be present in the BMFF spec. This
221 // includes the 'stts', 'stsc', and 'stco' boxes, which must contain no
222 // samples in order to be compliant files.
221 SampleDescription description; 223 SampleDescription description;
222 }; 224 };
223 225
224 struct MEDIA_EXPORT MediaHeader : Box { 226 struct MEDIA_EXPORT MediaHeader : Box {
225 DECLARE_BOX_METHODS(MediaHeader); 227 DECLARE_BOX_METHODS(MediaHeader);
226 228
227 uint64 creation_time; 229 uint64 creation_time;
228 uint64 modification_time; 230 uint64 modification_time;
229 uint32 timescale; 231 uint32 timescale;
230 uint64 duration; 232 uint64 duration;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 std::vector<TrackFragment> tracks; 342 std::vector<TrackFragment> tracks;
341 std::vector<ProtectionSystemSpecificHeader> pssh; 343 std::vector<ProtectionSystemSpecificHeader> pssh;
342 }; 344 };
343 345
344 #undef DECLARE_BOX 346 #undef DECLARE_BOX
345 347
346 } // namespace mp4 348 } // namespace mp4
347 } // namespace media 349 } // namespace media
348 350
349 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_ 351 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « media/mp4/avc_unittest.cc ('k') | media/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698