Add decoder de-initialize and reset to the Pepper CDM API.

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 249 matching lines @@
   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,
                const media::Decryptor::DecryptCB& decrypt_cb);
   // TODO(xhwang): Change DecryptCB to a DecoderInitCB.
   bool InitializeVideoDecoder(
       const media::VideoDecoderConfig& decoder_config,
       const media::Decryptor::DecryptCB& decrypt_cb);
+  // TODO(tomfinegan): Add callback args for DeinitializeDecoder() and
+  // ResetDecoder()
+  bool DeinitializeDecoder();
+  bool ResetDecoder();
   // TODO(xhwang): Update this when we need to support decrypt and decode.
   // Note: This method can be used with an unencrypted frame.
   bool DecryptAndDecodeFrame(
       const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
       const media::Decryptor::DecryptCB& decrypt_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.
@@ skipping 156 matching lines @@
       PP_URLComponents_Dev* components) OVERRIDE;
   virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) OVERRIDE;
   virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance,
                                             PP_Instance target) OVERRIDE;
   virtual PP_Var GetDocumentURL(PP_Instance instance,
                                 PP_URLComponents_Dev* components) OVERRIDE;
   virtual PP_Var GetPluginInstanceURL(
       PP_Instance instance,
       PP_URLComponents_Dev* components) OVERRIDE;
 
+  // PPB_ContentDecryptor_Private
+  // TODO(tomfinegan): Move the PPB_ContentDecryptor_Private methods to a
+  // delegate class.
   virtual void NeedKey(PP_Instance instance,
                        PP_Var key_system,
                        PP_Var session_id,
                        PP_Var init_data) OVERRIDE;
   virtual void KeyAdded(PP_Instance instance,
                         PP_Var key_system,
                         PP_Var session_id) OVERRIDE;
   virtual void KeyMessage(PP_Instance instance,
                           PP_Var key_system,
                           PP_Var session_id,
                           PP_Resource message,
                           PP_Var default_url) OVERRIDE;
   virtual void KeyError(PP_Instance instance,
                         PP_Var key_system,
                         PP_Var session_id,
                         int32_t media_error,
                         int32_t system_code) OVERRIDE;
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
                             const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DecoderInitialized(PP_Instance instance,
                                   PP_Bool success,
                                   uint32_t request_id) OVERRIDE;
+  virtual void DecoderDeinitializeDone(PP_Instance instance,
+                                       PP_DecryptorStreamType decoder_type,
+                                       uint32_t request_id) OVERRIDE;
+  virtual void DecoderResetDone(PP_Instance instance,
+                                PP_DecryptorStreamType decoder_type,
+                                uint32_t request_id) OVERRIDE;
   virtual void DeliverFrame(PP_Instance instance,
                             PP_Resource decrypted_frame,
                             const PP_DecryptedFrameInfo* frame_info) OVERRIDE;
   virtual void DeliverSamples(PP_Instance instance,
                               PP_Resource decrypted_samples,
                               const PP_DecryptedBlockInfo* block_info) OVERRIDE;
 
   // Reset this instance as proxied. Resets cached interfaces to point to the
   // proxy and re-sends DidCreate, DidChangeView, and HandleDocumentLoad (if
   // necessary).
@@ skipping 292 matching lines @@
   typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap;
   DecryptionCBMap pending_decryption_cbs_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_