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

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 11028087: Add decoder de-initialize and reset to the Pepper CDM API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments with the exception of renaming Deinit Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 90832004179f87884a8c3e1734d0a32411beddf6..d8359546161693997d155361ad7ddd744d3ccaf9 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1606,6 +1606,31 @@ bool PluginInstance::InitializeVideoDecoder(
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) {
@@ -2354,6 +2379,19 @@ void PluginInstance::DecoderInitialized(PP_Instance instance,
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) {
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698