diff options
| author | jrummell <jrummell@chromium.org> | 2015-10-01 13:43:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-01 20:44:00 +0000 |
| commit | 7c04ca6d03f4f4df96e93c24fa591eac1965a6f2 (patch) | |
| tree | 126a4ef0070f5f611b46e825432a708c907843f5 /media/cdm | |
| parent | 4cdab1b55e1c3b5ec71b9a9156fe97c97d869b94 (diff) | |
| download | chromium_src-7c04ca6d03f4f4df96e93c24fa591eac1965a6f2.zip chromium_src-7c04ca6d03f4f4df96e93c24fa591eac1965a6f2.tar.gz chromium_src-7c04ca6d03f4f4df96e93c24fa591eac1965a6f2.tar.bz2 | |
Update MediaKeyStatus enum values
Replace OutputNotAllowed with OutputRestricted and add Released.
These values have been added to the spec, so allow them to be returned
from the CDM.
BUG=528347
Review URL: https://codereview.chromium.org/1354723003
Cr-Commit-Position: refs/heads/master@{#351878}
Diffstat (limited to 'media/cdm')
| -rw-r--r-- | media/cdm/ppapi/cdm_adapter.cc | 6 | ||||
| -rw-r--r-- | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc index 092ab54..93479e2 100644 --- a/media/cdm/ppapi/cdm_adapter.cc +++ b/media/cdm/ppapi/cdm_adapter.cc @@ -289,8 +289,6 @@ PP_CdmMessageType CdmMessageTypeToPpMessageType(cdm::MessageType message) { } PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) { - // TODO(jrummell): Remove kOutputNotAllowed, add kOutputRestricted to CDM - // interface. http://crbug.com/507791. switch (status) { case cdm::kUsable: return PP_CDMKEYSTATUS_USABLE; @@ -298,12 +296,14 @@ PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) { return PP_CDMKEYSTATUS_INVALID; case cdm::kExpired: return PP_CDMKEYSTATUS_EXPIRED; - case cdm::kOutputNotAllowed: + case cdm::kOutputRestricted: return PP_CDMKEYSTATUS_OUTPUTRESTRICTED; case cdm::kOutputDownscaled: return PP_CDMKEYSTATUS_OUTPUTDOWNSCALED; case cdm::kStatusPending: return PP_CDMKEYSTATUS_STATUSPENDING; + case cdm::kReleased: + return PP_CDMKEYSTATUS_RELEASED; } PP_NOTREACHED(); diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc index fbe3829..4533f39 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc @@ -176,8 +176,6 @@ static media::EmeInitDataType ConvertInitDataType( } cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) { - // TODO(jrummell): Remove kOutputNotAllowed, add kOutputRestricted to CDM - // interface. http://crbug.com/507791. switch (status) { case media::CdmKeyInformation::KeyStatus::USABLE: return cdm::kUsable; @@ -186,11 +184,13 @@ cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) { case media::CdmKeyInformation::KeyStatus::EXPIRED: return cdm::kExpired; case media::CdmKeyInformation::KeyStatus::OUTPUT_RESTRICTED: - return cdm::kOutputNotAllowed; + return cdm::kOutputRestricted; case media::CdmKeyInformation::KeyStatus::OUTPUT_DOWNSCALED: return cdm::kOutputDownscaled; case media::CdmKeyInformation::KeyStatus::KEY_STATUS_PENDING: return cdm::kStatusPending; + case media::CdmKeyInformation::KeyStatus::RELEASED: + return cdm::kReleased; } NOTREACHED(); return cdm::kInternalError; |