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

Side by Side Diff: media/webm/webm_crypto_helpers.h

Issue 119203003: Drop DecryptConfig::data_offset_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_WEBM_WEBM_CRYPTO_HELPERS_H_ 5 #ifndef MEDIA_WEBM_WEBM_CRYPTO_HELPERS_H_
6 #define MEDIA_WEBM_WEBM_CRYPTO_HELPERS_H_ 6 #define MEDIA_WEBM_WEBM_CRYPTO_HELPERS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 // TODO(xhwang): Figure out the init data type appropriately once it's spec'ed. 14 // TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
15 // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=19096 for more 15 // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=19096 for more
16 // information. 16 // information.
17 const char kWebMEncryptInitDataType[] = "video/webm"; 17 const char kWebMEncryptInitDataType[] = "video/webm";
18 18
19 // Returns an initialized DecryptConfig, which can be sent to the Decryptor if 19 // Fills an initialized DecryptConfig, which can be sent to the Decryptor if
20 // the stream has potentially encrypted frames. Every encrypted Block has a 20 // the stream has potentially encrypted frames. Also sets |data_offset| which
21 // signal byte, and if the frame is encrypted, an initialization vector 21 // indicates where the encrypted data starts. Leaving the IV empty will tell
22 // prepended to the frame. Leaving the IV empty will tell the decryptor that the 22 // the decryptor that the frame is unencrypted. Returns true if |data| is valid,
23 // frame is unencrypted. Returns NULL if |data| is invalid. Current encrypted 23 // false otherwise, in which case |decrypt_config| and |data_offset| will not be
24 // WebM request for comments specification is here 24 // changed. Current encrypted WebM request for comments specification is here
25 // http://wiki.webmproject.org/encryption/webm-encryption-rfc 25 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
26 scoped_ptr<DecryptConfig> WebMCreateDecryptConfig( 26 bool WebMCreateDecryptConfig(const uint8* data, int data_size,
27 const uint8* data, int data_size, 27 const uint8* key_id, int key_id_size,
28 const uint8* key_id, int key_id_size); 28 scoped_ptr<DecryptConfig>* decrypt_config,
29 int* data_offset);
29 30
30 } // namespace media 31 } // namespace media
31 32
32 #endif // MEDIA_WEBM_WEBM_CRYPT_HELPERS_H_ 33 #endif // MEDIA_WEBM_WEBM_CRYPT_HELPERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698