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

Side by Side Diff: webkit/renderer/media/crypto/ppapi_decryptor.h

Issue 17381007: EME: ProxyDecryptor creates MediaKeys instead of Decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 5 #ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 virtual bool GenerateKeyRequest(const std::string& key_system, 44 virtual bool GenerateKeyRequest(const std::string& key_system,
45 const std::string& type, 45 const std::string& type,
46 const uint8* init_data, 46 const uint8* init_data,
47 int init_data_length) OVERRIDE; 47 int init_data_length) OVERRIDE;
48 virtual void AddKey(const std::string& key_system, 48 virtual void AddKey(const std::string& key_system,
49 const uint8* key, int key_length, 49 const uint8* key, int key_length,
50 const uint8* init_data, int init_data_length, 50 const uint8* init_data, int init_data_length,
51 const std::string& session_id) OVERRIDE; 51 const std::string& session_id) OVERRIDE;
52 virtual void CancelKeyRequest(const std::string& key_system, 52 virtual void CancelKeyRequest(const std::string& key_system,
53 const std::string& session_id) OVERRIDE; 53 const std::string& session_id) OVERRIDE;
54 virtual Decryptor* GetDecryptor() OVERRIDE;
54 55
55 // media::Decryptor implementation. 56 // media::Decryptor implementation.
56 virtual media::MediaKeys* GetMediaKeys() OVERRIDE;
57 virtual void RegisterNewKeyCB(StreamType stream_type, 57 virtual void RegisterNewKeyCB(StreamType stream_type,
58 const NewKeyCB& key_added_cb) OVERRIDE; 58 const NewKeyCB& key_added_cb) OVERRIDE;
59 virtual void Decrypt(StreamType stream_type, 59 virtual void Decrypt(StreamType stream_type,
60 const scoped_refptr<media::DecoderBuffer>& encrypted, 60 const scoped_refptr<media::DecoderBuffer>& encrypted,
61 const DecryptCB& decrypt_cb) OVERRIDE; 61 const DecryptCB& decrypt_cb) OVERRIDE;
62 virtual void CancelDecrypt(StreamType stream_type) OVERRIDE; 62 virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
63 virtual void InitializeAudioDecoder(const media::AudioDecoderConfig& config, 63 virtual void InitializeAudioDecoder(const media::AudioDecoderConfig& config,
64 const DecoderInitCB& init_cb) OVERRIDE; 64 const DecoderInitCB& init_cb) OVERRIDE;
65 virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config, 65 virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config,
66 const DecoderInitCB& init_cb) OVERRIDE; 66 const DecoderInitCB& init_cb) OVERRIDE;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 120 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
121 base::WeakPtr<PpapiDecryptor> weak_this_; 121 base::WeakPtr<PpapiDecryptor> weak_this_;
122 122
123 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 123 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
124 }; 124 };
125 125
126 } // namespace webkit_media 126 } // namespace webkit_media
127 127
128 #endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 128 #endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698