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

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

Issue 11013052: Add PPAPI CDM video decoder initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed with the exceptions being some questions and TODOs. 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.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 10c55f56ead19f3737c46b947e4a6fca37418ce5..08b4f9d634eeda324427f774e5fb98cc772823ad 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -74,6 +74,7 @@ struct WebPrintParams;
namespace media {
class DecoderBuffer;
class DecryptorClient;
+class VideoDecoderConfig;
}
namespace ppapi {
@@ -261,7 +262,12 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
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(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);
@@ -434,7 +440,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
PP_Instance instance,
PP_URLComponents_Dev* components) OVERRIDE;
- // TODO(tomfinegan): Move the next 7 methods to a delegate class.
virtual void NeedKey(PP_Instance instance,
PP_Var key_system,
PP_Var session_id,
@@ -455,6 +460,9 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
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 DeliverFrame(PP_Instance instance,
PP_Resource decrypted_frame,
const PP_DecryptedFrameInfo* frame_info) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698