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

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: Address phantom comments 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
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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 TrackType type; 202 TrackType type;
203 std::vector<VideoSampleEntry> video_entries; 203 std::vector<VideoSampleEntry> video_entries;
204 std::vector<AudioSampleEntry> audio_entries; 204 std::vector<AudioSampleEntry> audio_entries;
205 }; 205 };
206 206
207 struct MEDIA_EXPORT SampleTable : Box { 207 struct MEDIA_EXPORT SampleTable : Box {
208 DECLARE_BOX_METHODS(SampleTable); 208 DECLARE_BOX_METHODS(SampleTable);
209 209
210 // Media Source specific: we ignore many of the sub-boxes in this box, 210 // Media Source specific: we ignore many of the sub-boxes in this box,
211 // including some that are required to be present in the BMFF spec. 211 // including some that are required to be present in the BMFF spec. This
212 // includes the 'stts', 'stsc', and 'stco' boxes, which must contain no
213 // samples in order to be compliant files.
212 SampleDescription description; 214 SampleDescription description;
213 }; 215 };
214 216
215 struct MEDIA_EXPORT MediaHeader : Box { 217 struct MEDIA_EXPORT MediaHeader : Box {
216 DECLARE_BOX_METHODS(MediaHeader); 218 DECLARE_BOX_METHODS(MediaHeader);
217 219
218 uint64 creation_time; 220 uint64 creation_time;
219 uint64 modification_time; 221 uint64 modification_time;
220 uint32 timescale; 222 uint32 timescale;
221 uint64 duration; 223 uint64 duration;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 std::vector<TrackFragment> tracks; 333 std::vector<TrackFragment> tracks;
332 std::vector<ProtectionSystemSpecificHeader> pssh; 334 std::vector<ProtectionSystemSpecificHeader> pssh;
333 }; 335 };
334 336
335 #undef DECLARE_BOX 337 #undef DECLARE_BOX
336 338
337 } // namespace mp4 339 } // namespace mp4
338 } // namespace media 340 } // namespace media
339 341
340 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_ 342 #endif // MEDIA_MP4_BOX_DEFINITIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698