media: Require HW_SECURE_CODECS for other key systems on Android.

media/base/key_systems.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/key_systems.h"
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 765 matching lines @@
   // and SW_SECURE_DECODE in some order. If they are exactly those two then the
   // robustness requirement is not supported.
   if ((max_robustness == EmeRobustness::HW_SECURE_CRYPTO &&
        robustness == EmeRobustness::SW_SECURE_DECODE) ||
       (max_robustness == EmeRobustness::SW_SECURE_DECODE &&
        robustness == EmeRobustness::HW_SECURE_CRYPTO) ||
       robustness > max_robustness) {
     return EmeConfigRule::NOT_SUPPORTED;
   }
 
+#if defined(OS_CHROMEOS)
   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;
 
     // For video, recommend remote attestation if HW_SECURE_ALL is available,
     // because it enables hardware accelerated decoding.
     // TODO(sandersd): Only do this when hardware accelerated decoding is
     // available for the requested codecs.
     if (media_type == EmeMediaType::VIDEO &&
         max_robustness == EmeRobustness::HW_SECURE_ALL) {
       return EmeConfigRule::IDENTIFIER_RECOMMENDED;
     }
+  }
 #elif defined(OS_ANDROID)
-    if (robustness > EmeRobustness::SW_SECURE_CRYPTO)
-      return EmeConfigRule::HW_SECURE_CODECS_REQUIRED;
+  // Require hardware secure codecs for Widevine when SW_SECURE_DECODE or above
+  // is specified, or for all other key systems (excluding Clear Key).
+  if ((key_system == kWidevineKeySystem &&
+       robustness >= EmeRobustness::SW_SECURE_DECODE) ||

[xhwang, 2016/01/15 01:19:04]

I changed this to be >= which I think is more explicit.

[ddorwin, 2016/01/15 01:32:06]

Agreed.

+      !IsClearKey(key_system)) {
+    return EmeConfigRule::HW_SECURE_CODECS_REQUIRED;
+  }
 #endif  // defined(OS_CHROMEOS)
-  }
 
   return EmeConfigRule::SUPPORTED;
 }
 
 EmeSessionTypeSupport KeySystemsImpl::GetPersistentLicenseSessionSupport(
     const std::string& key_system) const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   KeySystemInfoMap::const_iterator key_system_iter =
       concrete_key_system_map_.find(key_system);
@@ skipping 113 matching lines @@
   KeySystemsImpl::GetInstance()->AddContainerMask(container, mask);
 }
 
 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type,
                                const std::string& codec,
                                uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
 }
 
 }  // namespace media