Index: webkit/media/crypto/ppapi_decryptor.h |
diff --git a/webkit/media/crypto/ppapi_decryptor.h b/webkit/media/crypto/ppapi_decryptor.h |
index c6c035f2df35797c79ee6783dc3bc8de3cf166d6..b65eb19d39dc1d0f85430993d2d20ae0c1e78d0f 100644 |
--- a/webkit/media/crypto/ppapi_decryptor.h |
+++ b/webkit/media/crypto/ppapi_decryptor.h |
@@ -50,31 +50,43 @@ class PpapiDecryptor : public media::Decryptor { |
const std::string& session_id) OVERRIDE; |
virtual void CancelKeyRequest(const std::string& key_system, |
const std::string& session_id) OVERRIDE; |
- virtual void Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted, |
+ virtual void Decrypt(StreamType stream_type, |
+ const scoped_refptr<media::DecoderBuffer>& encrypted, |
const DecryptCB& decrypt_cb) OVERRIDE; |
- virtual void CancelDecrypt() OVERRIDE; |
+ virtual void CancelDecrypt(StreamType stream_type) OVERRIDE; |
+ virtual void InitializeAudioDecoder( |
+ scoped_ptr<media::AudioDecoderConfig> config, |
+ const DecoderInitCB& init_cb, |
+ const KeyAddedCB& key_added_cb) OVERRIDE; |
virtual void InitializeVideoDecoder( |
scoped_ptr<media::VideoDecoderConfig> config, |
const DecoderInitCB& init_cb, |
const KeyAddedCB& key_added_cb) OVERRIDE; |
+ virtual void DecryptAndDecodeAudio( |
+ const scoped_refptr<media::DecoderBuffer>& encrypted, |
+ const AudioDecodeCB& audio_decode_cb) OVERRIDE; |
virtual void DecryptAndDecodeVideo( |
const scoped_refptr<media::DecoderBuffer>& encrypted, |
const VideoDecodeCB& video_decode_cb) OVERRIDE; |
- virtual void CancelDecryptAndDecodeVideo() OVERRIDE; |
- virtual void StopVideoDecoder() OVERRIDE; |
+ virtual void ResetDecoder(StreamType stream_type) OVERRIDE; |
+ virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE; |
private: |
void ReportFailureToCallPlugin(const std::string& key_system, |
const std::string& session_id); |
- void OnVideoDecoderInitialized(bool success); |
+ void OnDecoderInitialized(StreamType stream_type, |
+ const KeyAddedCB& key_added_cb, |
+ bool success); |
media::DecryptorClient* client_; |
scoped_refptr<webkit::ppapi::PluginInstance> cdm_plugin_; |
scoped_refptr<base::MessageLoopProxy> render_loop_proxy_; |
+ DecoderInitCB audio_decoder_init_cb_; |
DecoderInitCB video_decoder_init_cb_; |
- KeyAddedCB key_added_cb_; |
+ KeyAddedCB audio_key_added_cb_; |
+ KeyAddedCB video_key_added_cb_; |
base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; |
base::WeakPtr<PpapiDecryptor> weak_this_; |