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

Unified Diff: ppapi/c/private/ppp_content_decryptor_private.h

Issue 11013052: Add PPAPI CDM video decoder initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. 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 | « ppapi/c/private/ppb_content_decryptor_private.h ('k') | ppapi/cpp/private/content_decryptor_private.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/c/private/ppp_content_decryptor_private.h
diff --git a/ppapi/c/private/ppp_content_decryptor_private.h b/ppapi/c/private/ppp_content_decryptor_private.h
index 4c43b2799ef1148163b597442bc0d6133eb18ed0..24cc9a1b927dcd68894893de0015d16e99ed619c 100644
--- a/ppapi/c/private/ppp_content_decryptor_private.h
+++ b/ppapi/c/private/ppp_content_decryptor_private.h
@@ -4,7 +4,7 @@
*/
/* From private/ppp_content_decryptor_private.idl,
- * modified Mon Oct 01 20:27:29 2012.
+ * modified Mon Oct 8 13:45:19 2012.
*/
#ifndef PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_
@@ -18,10 +18,10 @@
#include "ppapi/c/pp_var.h"
#include "ppapi/c/private/pp_content_decryptor.h"
-#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_2 \
- "PPP_ContentDecryptor_Private;0.2"
+#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_3 \
+ "PPP_ContentDecryptor_Private;0.3"
#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE \
- PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_2
+ PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_3
/**
* @file
@@ -42,7 +42,7 @@
* Decryption Module (CDM) for v0.1 of the proposed Encrypted Media Extensions:
* http://goo.gl/rbdnR
*/
-struct PPP_ContentDecryptor_Private_0_2 {
+struct PPP_ContentDecryptor_Private_0_3 {
/**
* Generates a key request. key_system specifies the key or licensing system
* to use. init_data is a data buffer containing data for use in generating
@@ -114,6 +114,27 @@ struct PPP_ContentDecryptor_Private_0_2 {
PP_Resource encrypted_block,
const struct PP_EncryptedBlockInfo* encrypted_block_info);
/**
+ * Initializes the video decoder using codec and settings in
+ * <code>decoder_config</code>, and returns the result of the initialization
+ * request to the browser using the <code>DecoderInitialized()</code> method
+ * on the <code>PPB_ContentDecryptor_Private</code> interface.
+ *
+ * @param[in] decoder_config A <code>PP_VideoDecoderConfig</code> that
+ * contains video decoder settings and a request ID. The request ID is passed
+ * to the <code>DecoderInitialized()</code> method on the
+ * <code>PPB_ContentDecryptor_Private</code> interface to allow clients to
+ * associate the result with a video decoder initialization request.
+ *
+ * @param[in] codec_extra_data A <code>PP_Resource</code> corresponding to a
+ * <code>PPB_Buffer_Dev</code> resource containing codec setup data required
+ * by some codecs. It should be set to 0 when the codec being initialized
+ * does not require it.
+ */
+ void (*InitializeVideoDecoder)(
+ PP_Instance instance,
+ const struct PP_VideoDecoderConfig* decoder_config,
+ PP_Resource codec_extra_data);
+ /**
* Decrypts encrypted_video_frame, decodes it, and returns the unencrypted
* uncompressed (decoded) video frame to the browser via the
* <code>DeliverFrame()</code> method on the
@@ -133,7 +154,7 @@ struct PPP_ContentDecryptor_Private_0_2 {
const struct PP_EncryptedVideoFrameInfo* encrypted_video_frame_info);
};
-typedef struct PPP_ContentDecryptor_Private_0_2 PPP_ContentDecryptor_Private;
+typedef struct PPP_ContentDecryptor_Private_0_3 PPP_ContentDecryptor_Private;
/**
* @}
*/
« no previous file with comments | « ppapi/c/private/ppb_content_decryptor_private.h ('k') | ppapi/cpp/private/content_decryptor_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698