| Index: ppapi/c/private/ppb_content_decryptor_private.h
|
| diff --git a/ppapi/c/private/ppb_content_decryptor_private.h b/ppapi/c/private/ppb_content_decryptor_private.h
|
| index 070ee051238077f8fd3b71531bb7e8b6b187719c..a9a52bdb78d02265231da8dbdf0b05fcdca98bd9 100644
|
| --- a/ppapi/c/private/ppb_content_decryptor_private.h
|
| +++ b/ppapi/c/private/ppb_content_decryptor_private.h
|
| @@ -4,7 +4,7 @@
|
| */
|
|
|
| /* From private/ppb_content_decryptor_private.idl,
|
| - * modified Mon Oct 01 20:33:45 2012.
|
| + * modified Tue Oct 09 21:46:03 2012.
|
| */
|
|
|
| #ifndef PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_
|
| @@ -18,10 +18,10 @@
|
| #include "ppapi/c/pp_var.h"
|
| #include "ppapi/c/private/pp_content_decryptor.h"
|
|
|
| -#define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_2 \
|
| - "PPB_ContentDecryptor_Private;0.2"
|
| +#define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_3 \
|
| + "PPB_ContentDecryptor_Private;0.3"
|
| #define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE \
|
| - PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_2
|
| + PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_3
|
|
|
| /**
|
| * @file
|
| @@ -42,7 +42,7 @@
|
| * browser side support for the Content Decryption Module (CDM) for v0.1 of the
|
| * proposed Encrypted Media Extensions: http://goo.gl/rbdnR
|
| */
|
| -struct PPB_ContentDecryptor_Private_0_2 {
|
| +struct PPB_ContentDecryptor_Private_0_3 {
|
| /**
|
| * The decryptor requires a key that has not been provided.
|
| *
|
| @@ -160,6 +160,34 @@ struct PPB_ContentDecryptor_Private_0_2 {
|
| PP_Resource decrypted_block,
|
| const struct PP_DecryptedBlockInfo* decrypted_block_info);
|
| /**
|
| + * Called after the <code>DeinitializeDecoder()</code> method on the
|
| + * <code>PPP_ContentDecryptor_Private</code> interface completes to report
|
| + * decoder de-initialization completion to the browser.
|
| + *
|
| + * @param[in] decoder_type The <code>PP_StreamType</code> passed to
|
| + *<code>DeinitializeDecoder()</code>.
|
| + *
|
| + * @param[in] request_id The <code>request_id</code> value passed to
|
| + * <code>DeinitializeDecoder()</code>.
|
| + */
|
| + void (*DecoderDeinitializeDone)(PP_Instance instance,
|
| + PP_StreamType decoder_type,
|
| + uint32_t request_id);
|
| + /**
|
| + * Called after the <code>ResetDecoder()</code> method on the
|
| + * <code>PPP_ContentDecryptor_Private</code> interface completes to report
|
| + * decoder reset completion to the browser.
|
| + *
|
| + * @param[in] decoder_type The <code>PP_StreamType</code> passed to
|
| + *<code>ResetDecoder()</code>.
|
| + *
|
| + * @param[in] request_id The <code>request_id</code> value passed to
|
| + * <code>ResetDecoder()</code>.
|
| + */
|
| + void (*DecoderResetDone)(PP_Instance instance,
|
| + PP_StreamType decoder_type,
|
| + uint32_t request_id);
|
| + /**
|
| * Called after the <code>DecryptAndDecode()</code> method on the
|
| * <code>PPP_ContentDecryptor_Private</code> interface completes to deliver
|
| * a decrypted and decoded video frame to the browser for rendering.
|
| @@ -195,7 +223,7 @@ struct PPB_ContentDecryptor_Private_0_2 {
|
| const struct PP_DecryptedBlockInfo* decrypted_block_info);
|
| };
|
|
|
| -typedef struct PPB_ContentDecryptor_Private_0_2 PPB_ContentDecryptor_Private;
|
| +typedef struct PPB_ContentDecryptor_Private_0_3 PPB_ContentDecryptor_Private;
|
| /**
|
| * @}
|
| */
|
|
|