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

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

Issue 616183002: Revert of Pass initDataType instead of contentType on OnNeedKey(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/mp4_stream_parser_unittest.cc ('k') | no next file » | 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_WEBM_WEBM_CRYPTO_HELPERS_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_ 6 #define MEDIA_FORMATS_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 const char kWebMEncryptInitDataType[] = "webm"; 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
16 // information.
17 const char kWebMEncryptInitDataType[] = "video/webm";
15 18
16 // Fills an initialized DecryptConfig, which can be sent to the Decryptor if 19 // Fills an initialized DecryptConfig, which can be sent to the Decryptor if
17 // the stream has potentially encrypted frames. Also sets |data_offset| which 20 // the stream has potentially encrypted frames. Also sets |data_offset| which
18 // indicates where the encrypted data starts. Leaving the IV empty will tell 21 // indicates where the encrypted data starts. Leaving the IV empty will tell
19 // the decryptor that the frame is unencrypted. Returns true if |data| is valid, 22 // the decryptor that the frame is unencrypted. Returns true if |data| is valid,
20 // false otherwise, in which case |decrypt_config| and |data_offset| will not be 23 // false otherwise, in which case |decrypt_config| and |data_offset| will not be
21 // changed. Current encrypted WebM request for comments specification is here 24 // changed. Current encrypted WebM request for comments specification is here
22 // http://wiki.webmproject.org/encryption/webm-encryption-rfc 25 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
23 bool WebMCreateDecryptConfig(const uint8* data, int data_size, 26 bool WebMCreateDecryptConfig(const uint8* data, int data_size,
24 const uint8* key_id, int key_id_size, 27 const uint8* key_id, int key_id_size,
25 scoped_ptr<DecryptConfig>* decrypt_config, 28 scoped_ptr<DecryptConfig>* decrypt_config,
26 int* data_offset); 29 int* data_offset);
27 30
28 } // namespace media 31 } // namespace media
29 32
30 #endif // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_ 33 #endif // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/mp4_stream_parser_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698