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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h"
11 #include "media/base/decrypt_config.h" 10 #include "media/base/decrypt_config.h"
12 11
13 namespace media { 12 namespace media {
14 namespace mp4 { 13 namespace mp4 {
15 14
16 class BufferReader; 15 class BufferReader;
17 16
18 struct FrameCENCInfo { 17 struct FrameCENCInfo {
19 uint8 iv[16]; 18 uint8_t iv[16];
20 std::vector<SubsampleEntry> subsamples; 19 std::vector<SubsampleEntry> subsamples;
21 20
22 FrameCENCInfo(); 21 FrameCENCInfo();
23 ~FrameCENCInfo(); 22 ~FrameCENCInfo();
24 bool Parse(int iv_size, BufferReader* r) WARN_UNUSED_RESULT; 23 bool Parse(int iv_size, BufferReader* r) WARN_UNUSED_RESULT;
25 bool GetTotalSizeOfSubsamples(size_t* total_size) const WARN_UNUSED_RESULT; 24 bool GetTotalSizeOfSubsamples(size_t* total_size) const WARN_UNUSED_RESULT;
26 }; 25 };
27 26
28 27
29 } // namespace mp4 28 } // namespace mp4
30 } // namespace media 29 } // namespace media
31 30
32 #endif // MEDIA_FORMATS_MP4_CENC_H_ 31 #endif // MEDIA_FORMATS_MP4_CENC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698