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

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: Renaming and generalizing done... 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
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 e6d0eeeef7bc34e270c52e5f11db130db19aee18..d6af2b57633d65c71edc6f6e20c71e5bf75c532e 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1546,6 +1546,28 @@ bool PluginInstance::Decrypt(
return true;
}
+bool PluginInstance::DeinitializeDecoder() {
+ if (!LoadContentDecryptorInterface())
+ return false;
+
+ // TODO(tomfinegan): Add decoder deinitialize request tracking.
+ plugin_decryption_interface_->DeinitializeDecoder(pp_instance(),
+ PP_STREAMTYPE_UNKNOWN,
+ 0);
+ return true;
+}
+
+bool PluginInstance::ResetDecoder() {
+ if (!LoadContentDecryptorInterface())
+ return false;
+
+ // TODO(tomfinegan): Add decoder reset request tracking.
+ plugin_decryption_interface_->ResetDecoder(pp_instance(),
+ PP_STREAMTYPE_UNKNOWN,
+ 0);
+ return true;
+}
+
// Note: this method can be used with an unencrypted frame.
bool PluginInstance::DecryptAndDecodeFrame(
const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
@@ -2279,6 +2301,18 @@ void PluginInstance::KeyError(PP_Instance instance,
system_code);
}
+void PluginInstance::DecoderDeinitializeDone(PP_Instance instance,
+ PP_StreamType decoder_type,
+ uint32_t request_id) {
+ // TODO(tomfinegan): Add decoder stop completion handling.
+}
+
+void PluginInstance::DecoderResetDone(PP_Instance instance,
+ PP_StreamType 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) {

Powered by Google App Engine
This is Rietveld 408576698