diff options
| author | jrummell <jrummell@chromium.org> | 2015-03-17 14:46:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-17 21:47:30 +0000 |
| commit | 7c9fe86c47dd929b4c78ecf9a6492a243739cc99 (patch) | |
| tree | babaf948b0d5e0658b9c3b39b90281df89793768 /ppapi | |
| parent | f09ad6346a0c850b97e316976b79ef54278cd69b (diff) | |
| download | chromium_src-7c9fe86c47dd929b4c78ecf9a6492a243739cc99.zip chromium_src-7c9fe86c47dd929b4c78ecf9a6492a243739cc99.tar.gz chromium_src-7c9fe86c47dd929b4c78ecf9a6492a243739cc99.tar.bz2 | |
Add missing CdmKeyInformation enum values
Latest EME spec has added new values to MediaKeyStatus
(https://w3c.github.io/encrypted-media/#idl-def-MediaKeyStatus),
so pass these though Pepper. Changes to the CDM interface will
come later.
BUG=465592
TEST=none, as the new values not currently used
Review URL: https://codereview.chromium.org/1005213002
Cr-Commit-Position: refs/heads/master@{#320982}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/api/private/pp_content_decryptor.idl | 4 | ||||
| -rw-r--r-- | ppapi/c/private/pp_content_decryptor.h | 6 | ||||
| -rw-r--r-- | ppapi/proxy/ppapi_messages.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/ppapi/api/private/pp_content_decryptor.idl b/ppapi/api/private/pp_content_decryptor.idl index ee7a631..d456635 100644 --- a/ppapi/api/private/pp_content_decryptor.idl +++ b/ppapi/api/private/pp_content_decryptor.idl @@ -442,7 +442,9 @@ enum PP_CdmKeyStatus { PP_CDMKEYSTATUS_USABLE = 0, PP_CDMKEYSTATUS_INVALID = 1, PP_CDMKEYSTATUS_EXPIRED = 2, - PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3 + PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3, + PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4, + PP_CDMKEYSTATUS_STATUSPENDING = 5 }; /** diff --git a/ppapi/c/private/pp_content_decryptor.h b/ppapi/c/private/pp_content_decryptor.h index 6e03ed5..31d53ca 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 Wed Jan 7 18:40:14 2015. */ +/* From private/pp_content_decryptor.idl modified Fri Mar 13 14:53:18 2015. */ #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ @@ -491,7 +491,9 @@ typedef enum { PP_CDMKEYSTATUS_USABLE = 0, PP_CDMKEYSTATUS_INVALID = 1, PP_CDMKEYSTATUS_EXPIRED = 2, - PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3 + PP_CDMKEYSTATUS_OUTPUTNOTALLOWED = 3, + PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4, + PP_CDMKEYSTATUS_STATUSPENDING = 5 } PP_CdmKeyStatus; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4); /** diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 0f1f393..e0f7d41 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -92,7 +92,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, IPC_ENUM_TRAITS(PP_AudioSampleRate) IPC_ENUM_TRAITS_MAX_VALUE(PP_BlendMode, PP_BLENDMODE_LAST) IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmExceptionCode, PP_CDMEXCEPTIONCODE_OUTPUTERROR) -IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmKeyStatus, PP_CDMKEYSTATUS_OUTPUTNOTALLOWED) +IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmKeyStatus, PP_CDMKEYSTATUS_STATUSPENDING) IPC_ENUM_TRAITS_MAX_VALUE(PP_CdmMessageType, PP_CDMMESSAGETYPE_LICENSE_RELEASE) IPC_ENUM_TRAITS(PP_DeviceType_Dev) IPC_ENUM_TRAITS(PP_DecryptorStreamType) |