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

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

Issue 811923002: Changes to support CDM_7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CrOS compile error Created 5 years, 11 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/pp_macros.h ('k') | ppapi/c/private/ppb_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/pp_content_decryptor.h
diff --git a/ppapi/c/private/pp_content_decryptor.h b/ppapi/c/private/pp_content_decryptor.h
index 971d2a0b619b37772698b4d870467de9e797e199..6e03ed5be05515f4208ded9a10bfe60f2a238660 100644
--- a/ppapi/c/private/pp_content_decryptor.h
+++ b/ppapi/c/private/pp_content_decryptor.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From private/pp_content_decryptor.idl modified Thu Jun 5 13:39:15 2014. */
+/* From private/pp_content_decryptor.idl modified Wed Jan 7 18:40:14 2015. */
#ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
#define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
@@ -455,7 +455,8 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptorStreamType, 4);
*/
typedef enum {
PP_SESSIONTYPE_TEMPORARY = 0,
- PP_SESSIONTYPE_PERSISTENT = 1
+ PP_SESSIONTYPE_PERSISTENT_LICENSE = 1,
+ PP_SESSIONTYPE_PERSISTENT_RELEASE = 2
} PP_SessionType;
PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_SessionType, 4);
@@ -472,6 +473,55 @@ typedef enum {
PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7
} PP_CdmExceptionCode;
PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmExceptionCode, 4);
+
+/**
+ * <code>PP_CdmMessageType</code> contains message type constants.
+ */
+typedef enum {
+ PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0,
+ PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1,
+ PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2
+} PP_CdmMessageType;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4);
+
+/**
+ * <code>PP_CdmKeyStatus</code> contains key status constants.
+ */
+typedef enum {
+ PP_CDMKEYSTATUS_USABLE = 0,
+ PP_CDMKEYSTATUS_INVALID = 1,
+ PP_CDMKEYSTATUS_EXPIRED = 2,
+ PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3
+} PP_CdmKeyStatus;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4);
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup Structs
+ * @{
+ */
+/**
+ * The <code>PP_KeyInformation</code> struct contains information about a
+ * key used for decryption.
+ */
+struct PP_KeyInformation {
+ /**
+ * Key ID.
+ */
+ uint8_t key_id[512];
+ uint32_t key_id_size;
+ /**
+ * Status of this key.
+ */
+ PP_CdmKeyStatus key_status;
+ /**
+ * Optional error code for keys that are not usable.
+ */
+ uint32_t system_code;
+};
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
/**
* @}
*/
« no previous file with comments | « ppapi/c/pp_macros.h ('k') | ppapi/c/private/ppb_content_decryptor_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698