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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

Issue 1023003002: Add support for cdm::ContentDecryptionModule_8, remove CDM_6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: new bug # Created 5 years, 9 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 | « media/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/supported_cdm_versions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
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 e7f322b0614a4eb9746da6c221aa027451217189..026fd0c03ebb69e193dcb3c72026a6a9419cf67d 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -171,8 +171,6 @@ static media::MediaKeys::SessionType ConvertSessionType(
}
cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) {
- // TODO(jrummell): Update OUTPUT_DOWNSCALED and KEY_STATUS_PENDING once CDM
- // interface supports them. http://crbug.com/450861
switch (status) {
case media::CdmKeyInformation::KeyStatus::USABLE:
return cdm::kUsable;
@@ -183,9 +181,9 @@ cdm::KeyStatus ConvertKeyStatus(media::CdmKeyInformation::KeyStatus status) {
case media::CdmKeyInformation::KeyStatus::OUTPUT_NOT_ALLOWED:
return cdm::kOutputNotAllowed;
case media::CdmKeyInformation::KeyStatus::OUTPUT_DOWNSCALED:
- return cdm::kInternalError;
+ return cdm::kOutputDownscaled;
case media::CdmKeyInformation::KeyStatus::KEY_STATUS_PENDING:
- return cdm::kInternalError;
+ return cdm::kStatusPending;
}
NOTIMPLEMENTED();
return cdm::kInternalError;
« no previous file with comments | « media/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/supported_cdm_versions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698