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

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

Issue 1874413003: Convert media/formats to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include <memory>
11
11 #include "media/base/decoder_buffer.h" 12 #include "media/base/decoder_buffer.h"
12 13
13 namespace media { 14 namespace media {
14 15
15 // Fills an initialized DecryptConfig, which can be sent to the Decryptor if 16 // Fills an initialized DecryptConfig, which can be sent to the Decryptor if
16 // the stream has potentially encrypted frames. Also sets |data_offset| which 17 // the stream has potentially encrypted frames. Also sets |data_offset| which
17 // indicates where the encrypted data starts. Leaving the IV empty will tell 18 // indicates where the encrypted data starts. Leaving the IV empty will tell
18 // the decryptor that the frame is unencrypted. Returns true if |data| is valid, 19 // the decryptor that the frame is unencrypted. Returns true if |data| is valid,
19 // false otherwise, in which case |decrypt_config| and |data_offset| will not be 20 // false otherwise, in which case |decrypt_config| and |data_offset| will not be
20 // changed. Current encrypted WebM request for comments specification is here 21 // changed. Current encrypted WebM request for comments specification is here
21 // http://wiki.webmproject.org/encryption/webm-encryption-rfc 22 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
22 bool WebMCreateDecryptConfig(const uint8_t* data, 23 bool WebMCreateDecryptConfig(const uint8_t* data,
23 int data_size, 24 int data_size,
24 const uint8_t* key_id, 25 const uint8_t* key_id,
25 int key_id_size, 26 int key_id_size,
26 scoped_ptr<DecryptConfig>* decrypt_config, 27 std::unique_ptr<DecryptConfig>* decrypt_config,
27 int* data_offset); 28 int* data_offset);
28 29
29 } // namespace media 30 } // namespace media
30 31
31 #endif // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_ 32 #endif // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698