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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/formats/mp4/box_reader_unittest.cc ('k') | media/formats/mp4/es_descriptor.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_CENC_H_ 5 #ifndef MEDIA_FORMATS_MP4_CENC_H_
6 #define MEDIA_FORMATS_MP4_CENC_H_ 6 #define MEDIA_FORMATS_MP4_CENC_H_
7 7
8 #include <stddef.h>
9 #include <stdint.h>
10
8 #include <vector> 11 #include <vector>
9 12
10 #include "media/base/decrypt_config.h" 13 #include "media/base/decrypt_config.h"
11 14
12 namespace media { 15 namespace media {
13 namespace mp4 { 16 namespace mp4 {
14 17
15 class BufferReader; 18 class BufferReader;
16 19
17 struct FrameCENCInfo { 20 struct FrameCENCInfo {
18 uint8_t iv[16]; 21 uint8_t iv[16];
19 std::vector<SubsampleEntry> subsamples; 22 std::vector<SubsampleEntry> subsamples;
20 23
21 FrameCENCInfo(); 24 FrameCENCInfo();
22 ~FrameCENCInfo(); 25 ~FrameCENCInfo();
23 bool Parse(int iv_size, BufferReader* r) WARN_UNUSED_RESULT; 26 bool Parse(int iv_size, BufferReader* r) WARN_UNUSED_RESULT;
24 bool GetTotalSizeOfSubsamples(size_t* total_size) const WARN_UNUSED_RESULT; 27 bool GetTotalSizeOfSubsamples(size_t* total_size) const WARN_UNUSED_RESULT;
25 }; 28 };
26 29
27 30
28 } // namespace mp4 31 } // namespace mp4
29 } // namespace media 32 } // namespace media
30 33
31 #endif // MEDIA_FORMATS_MP4_CENC_H_ 34 #endif // MEDIA_FORMATS_MP4_CENC_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/box_reader_unittest.cc ('k') | media/formats/mp4/es_descriptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698