Update PluginInstance for audio support for content decryption.

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 244 matching lines @@
 
   // Provides access to PPP_ContentDecryptor_Private.
   // TODO(tomfinegan): Move decryptor methods to delegate class.
   void set_decrypt_client(media::DecryptorClient* client);
   bool GenerateKeyRequest(const std::string& key_system,
                           const std::string& init_data);
   bool AddKey(const std::string& session_id,
               const std::string& key,
               const std::string& init_data);
   bool CancelKeyRequest(const std::string& session_id);
-  bool Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
+  bool Decrypt(media::Decryptor::StreamType stream_type,
+               const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
                const media::Decryptor::DecryptCB& decrypt_cb);
+  bool CancelDecrypt(media::Decryptor::StreamType stream_type);
   bool InitializeAudioDecoder(
       const media::AudioDecoderConfig& decoder_config,
       const media::Decryptor::DecoderInitCB& decoder_init_cb);
   bool InitializeVideoDecoder(
       const media::VideoDecoderConfig& decoder_config,
       const media::Decryptor::DecoderInitCB& decoder_init_cb);
   // TODO(tomfinegan): Add callback args for DeinitializeDecoder() and
   // ResetDecoder()
-  bool DeinitializeDecoder();
-  bool ResetDecoder();
-  // Note: This method can be used with an unencrypted frame.
-  bool DecryptAndDecode(
+  bool DeinitializeDecoder(media::Decryptor::StreamType stream_type);
+  bool ResetDecoder(media::Decryptor::StreamType stream_type);
+  // Note: These methods can be used with unencrypted data.
+  bool DecryptAndDecodeAudio(
+      const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
+      const media::Decryptor::AudioDecodeCB& audio_decode_cb);
+  bool DecryptAndDecodeVideo(
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       const media::Decryptor::VideoDecodeCB& video_decode_cb);
 
   // There are 2 implementations of the fullscreen interface
   // PPB_FlashFullscreen is used by Pepper Flash.
   // PPB_Fullscreen is intended for other applications including NaCl.
   // The two interface are mutually exclusive.
 
   // Implementation of PPB_FlashFullscreen.
 
@@ skipping 300 matching lines @@
   // Returns true if the WebView the plugin is in renders via the accelerated
   // compositing path.
   bool IsViewAccelerated();
 
   // Track, set and reset size attributes to control the size of the plugin
   // in and out of fullscreen mode.
   void KeepSizeAttributesBeforeFullscreen();
   void SetSizeAttributesForFullscreen();
   void ResetSizeAttributesAfterFullscreen();
 
+  // Cancels the pending decrypt-and-decode callback for |stream_type|.
+  void CancelDecode(media::Decryptor::StreamType stream_type);
+
   PluginDelegate* delegate_;
   scoped_refptr<PluginModule> module_;
   scoped_ptr< ::ppapi::PPP_Instance_Combined> instance_interface_;
   // If this is the NaCl plugin, we create a new module when we switch to the
   // IPC-based PPAPI proxy. Store the original module and instance interface
   // so we can shut down properly.
   scoped_refptr<PluginModule> original_module_;
   scoped_ptr< ::ppapi::PPP_Instance_Combined> original_instance_interface_;
 
   PP_Instance pp_instance_;
@@ skipping 176 matching lines @@
   scoped_refptr<PPB_URLLoader_Impl> document_loader_;
 
   media::DecryptorClient* decryptor_client_;
 
   // Request ID for tracking pending content decryption callbacks.
   // Note that zero indicates an invalid request ID.
   // TODO(xhwang): Add completion callbacks for Reset/Stop and remove the use
   // of request IDs.
   uint32_t next_decryption_request_id_;
 
-  // TODO(xhwang): Use two separate callbacks for video and audio instead using
-  // a map here.
-  typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap;
-  DecryptionCBMap pending_decryption_cbs_;
+  uint32_t pending_audio_decrypt_request_id_;
+  media::Decryptor::DecryptCB pending_audio_decrypt_cb_;
+
+  uint32_t pending_video_decrypt_request_id_;
+  media::Decryptor::DecryptCB pending_video_decrypt_cb_;
 
   uint32_t pending_audio_decoder_init_request_id_;
   media::Decryptor::DecoderInitCB pending_audio_decoder_init_cb_;
 
   uint32_t pending_video_decoder_init_request_id_;
   media::Decryptor::DecoderInitCB pending_video_decoder_init_cb_;
 
+  uint32_t pending_audio_decode_request_id_;
+  media::Decryptor::AudioDecodeCB pending_audio_decode_cb_;
+
   uint32_t pending_video_decode_request_id_;
   media::Decryptor::VideoDecodeCB pending_video_decode_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_