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 /content/renderer | |
| 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 'content/renderer')
| -rw-r--r-- | content/renderer/pepper/content_decryptor_delegate.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc index 0c17e3e..a3596c8 100644 --- a/content/renderer/pepper/content_decryptor_delegate.cc +++ b/content/renderer/pepper/content_decryptor_delegate.cc @@ -322,6 +322,8 @@ media::CdmKeyInformation::KeyStatus PpCdmKeyStatusToCdmKeyInformationKeyStatus( return media::CdmKeyInformation::OUTPUT_DOWNSCALED; case PP_CDMKEYSTATUS_STATUSPENDING: return media::CdmKeyInformation::KEY_STATUS_PENDING; + case PP_CDMKEYSTATUS_RELEASED: + return media::CdmKeyInformation::RELEASED; default: NOTREACHED(); return media::CdmKeyInformation::INTERNAL_ERROR; |