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

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 1588 matching lines @@
       MakeBufferResource(pp_instance(),
                          decoder_config.extra_data(),
                          decoder_config.extra_data_size()));
 
   plugin_decryption_interface_->InitializeVideoDecoder(pp_instance(),
                                                        &pp_decoder_config,
                                                        extra_data_resource);
   return true;
 }
 
+bool PluginInstance::DeinitializeDecoder() {
+  if (!LoadContentDecryptorInterface())
+    return false;
+
+  // TODO(tomfinegan): Add decoder deinitialize request tracking, and get
+  // stream type from media stack.
+  plugin_decryption_interface_->DeinitializeDecoder(
+      pp_instance(),
+      PP_DECRYPTORSTREAMTYPE_VIDEO,
+      0);
+  return true;
+}
+
+bool PluginInstance::ResetDecoder() {
+  if (!LoadContentDecryptorInterface())
+    return false;
+
+  // TODO(tomfinegan): Add decoder reset request tracking, and get
+  // stream type from media stack.
+  plugin_decryption_interface_->ResetDecoder(pp_instance(),
+                                             PP_DECRYPTORSTREAMTYPE_VIDEO,
+                                             0);
+  return true;
+}
+
 bool PluginInstance::DecryptAndDecodeFrame(
     const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
     const media::Decryptor::DecryptCB& decrypt_cb) {
   if (!LoadContentDecryptorInterface())
     return false;
 
   ScopedPPResource encrypted_resource(MakeBufferResource(
       pp_instance(),
       encrypted_frame->GetData(),
       encrypted_frame->GetDataSize()));
@@ skipping 728 matching lines @@
     return;
   media::Decryptor::DecryptCB decrypt_cb = found->second;
   pending_decryption_cbs_.erase(found);
 
   media::Decryptor::Status status =
       success == PP_TRUE ? media::Decryptor::kSuccess :
                            media::Decryptor::kError;
   decrypt_cb.Run(status, NULL);
 }
 
+void PluginInstance::DecoderDeinitializeDone(
+    PP_Instance instance,
+    PP_DecryptorStreamType decoder_type,
+    uint32_t request_id) {
+  // TODO(tomfinegan): Add decoder stop completion handling.
+}
+
+void PluginInstance::DecoderResetDone(PP_Instance instance,
+                                      PP_DecryptorStreamType decoder_type,
+                                      uint32_t request_id) {
+  // TODO(tomfinegan): Add decoder reset completion handling.
+}
+
 void PluginInstance::DeliverBlock(PP_Instance instance,
                                   PP_Resource decrypted_block,
                                   const PP_DecryptedBlockInfo* block_info) {
   DCHECK(block_info);
   DecryptionCBMap::iterator found = pending_decryption_cbs_.find(
       block_info->tracking_info.request_id);
   if (found == pending_decryption_cbs_.end())
     return;
   media::Decryptor::DecryptCB decrypt_cb = found->second;
   pending_decryption_cbs_.erase(found);
@@ skipping 422 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit