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

Side by Side Diff: media/mp4/avc.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: Remove references to non-public encrypted files in tests Created 8 years, 6 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_AVC_H_ 5 #ifndef MEDIA_MP4_AVC_H_
6 #define MEDIA_MP4_AVC_H_ 6 #define MEDIA_MP4_AVC_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "media/base/channel_layout.h" 11 #include "media/base/channel_layout.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 13
14 namespace media { 14 namespace media {
15 namespace mp4 { 15 namespace mp4 {
16 16
17 struct AVCDecoderConfigurationRecord; 17 struct AVCDecoderConfigurationRecord;
18 18
19 class MEDIA_EXPORT AVC { 19 class MEDIA_EXPORT AVC {
20 public: 20 public:
21 static bool ConvertToAnnexB(int length_size, std::vector<uint8>* buffer); 21 static bool ConvertToAnnexB(int length_size, std::vector<uint8>* buffer);
22 22
23 static bool InsertParameterSets( 23 static bool ConvertParameterSets(
24 const AVCDecoderConfigurationRecord& avc_config, 24 const AVCDecoderConfigurationRecord& avc_config,
25 std::vector<uint8>* buffer); 25 std::vector<uint8>* buffer);
26 26
27 static ChannelLayout ConvertAACChannelCountToChannelLayout(int count); 27 static ChannelLayout ConvertAACChannelCountToChannelLayout(int count);
28 }; 28 };
29 29
30 30
31 } // namespace mp4 31 } // namespace mp4
32 } // namespace media 32 } // namespace media
33 33
34 #endif // MEDIA_MP4_AVC_H_ 34 #endif // MEDIA_MP4_AVC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698