diff options
| author | ddorwin <ddorwin@chromium.org> | 2016-01-14 21:42:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 05:43:02 +0000 |
| commit | 2de7ec004ece092688f387d4d03301dfccbdb365 (patch) | |
| tree | 5d3c509fb77735bf62203db82a379bca1b846504 /media | |
| parent | 19fa2350fe99b3990915209e0b70928a381684e8 (diff) | |
| download | chromium_src-2de7ec004ece092688f387d4d03301dfccbdb365.zip chromium_src-2de7ec004ece092688f387d4d03301dfccbdb365.tar.gz chromium_src-2de7ec004ece092688f387d4d03301dfccbdb365.tar.bz2 | |
EME: Do not special case an empty robustness string.
From the EME spec: "The empty string indicates that any ability to decrypt and
decode the content type is acceptable."
Retain a temporary exception for Chrome OS.
BUG=482277,577777
Review URL: https://codereview.chromium.org/1585083003
Cr-Commit-Position: refs/heads/master@{#369690}
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/key_systems.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc index 744ae2d..78a1904 100644 --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc @@ -754,8 +754,6 @@ EmeConfigRule KeySystemsImpl::GetRobustnessConfigRule( EmeRobustness robustness = ConvertRobustness(requested_robustness); if (robustness == EmeRobustness::INVALID) return EmeConfigRule::NOT_SUPPORTED; - if (robustness == EmeRobustness::EMPTY) - return EmeConfigRule::SUPPORTED; KeySystemInfoMap::const_iterator key_system_iter = concrete_key_system_map_.find(key_system); @@ -787,6 +785,11 @@ EmeConfigRule KeySystemsImpl::GetRobustnessConfigRule( if (key_system == kWidevineKeySystem) { #if defined(OS_CHROMEOS) + // TODO(ddorwin): Remove this once we have confirmed it is not necessary. + // See https://crbug.com/482277 + if (robustness == EmeRobustness::EMPTY) + return EmeConfigRule::SUPPORTED; + // Hardware security requires remote attestation. if (robustness >= EmeRobustness::HW_SECURE_CRYPTO) return EmeConfigRule::IDENTIFIER_REQUIRED; |