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

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: 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/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/mp4/avc.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_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/media_export.h" 11 #include "media/base/media_export.h"
12 12
13 namespace media { 13 namespace media {
14 namespace mp4 { 14 namespace mp4 {
15 15
16 struct AVCDecoderConfigurationRecord; 16 struct AVCDecoderConfigurationRecord;
17 17
18 class MEDIA_EXPORT AVC { 18 class MEDIA_EXPORT AVC {
19 public: 19 public:
20 static bool ConvertToAnnexB(int length_size, std::vector<uint8>* buffer); 20 static bool ConvertFrameToAnnexB(int length_size, std::vector<uint8>* buffer);
21 21
22 static bool InsertParameterSets( 22 static bool ConvertConfigToAnnexB(
23 const AVCDecoderConfigurationRecord& avc_config, 23 const AVCDecoderConfigurationRecord& avc_config,
24 std::vector<uint8>* buffer); 24 std::vector<uint8>* buffer);
25 }; 25 };
26 26
27 } // namespace mp4 27 } // namespace mp4
28 } // namespace media 28 } // namespace media
29 29
30 #endif // MEDIA_MP4_AVC_H_ 30 #endif // MEDIA_MP4_AVC_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/mp4/avc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698