| 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..fb26939cefc8df8ceb07cd754c3be6171f7105d2 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 Tue Oct 9 18:51:23 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,40 @@ struct PPP_ContentDecryptor_Private_0_2 {
|
| PP_Resource encrypted_block,
|
| const struct PP_EncryptedBlockInfo* encrypted_block_info);
|
| /**
|
| + * De-initializes the decoder for the <code>PP_StreamType</code> specified
|
| + * by <code>decoder_type</code>. De-initialization completion is reported to
|
| + * the browser using the <code>DecoderDeinitializeDone()</code> method on
|
| + * the <code>PPB_ContentDecryptor_Private</code> interface.
|
| + *
|
| + * @param[in] decoder_type A <code>PP_StreamType</code> that specifies the
|
| + * decoder to de-initialize.
|
| + *
|
| + * @param[in] request_id A request ID that allows the browser to associate a
|
| + * request to de-initialize a decoder with the corresponding call to the
|
| + * <code>DecoderDeinitializeDone()</code> method on the
|
| + * <code>PPB_ContentDecryptor_Private</code> interface.
|
| + */
|
| + void (*DeinitializeDecoder)(PP_Instance instance,
|
| + PP_StreamType decoder_type,
|
| + uint32_t request_id);
|
| + /**
|
| + * Resets the decoder for the <code>PP_StreamType</code> specified
|
| + * by <code>decoder_type</code>. Reset completion is reported to the browser
|
| + * using the <code>DecoderResetDone()</code> method on the
|
| + * <code>PPB_ContentDecryptor_Private</code> interface.
|
| + *
|
| + * @param[in] decoder_type A <code>PP_StreamType</code> that specifies the
|
| + * decoder to reset.
|
| + *
|
| + * @param[in] request_id A request ID that allows the browser to associate a
|
| + * request to reset the decoder with a corresponding call to the
|
| + * <code>DecoderResetDone()</code> method on the
|
| + * <code>PPB_ContentDecryptor_Private</code> interface.
|
| + */
|
| + void (*ResetDecoder)(PP_Instance instance,
|
| + PP_StreamType decoder_type,
|
| + uint32_t request_id);
|
| + /**
|
| * 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 +167,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;
|
| /**
|
| * @}
|
| */
|
|
|