Allow hw secured codecs on chromecast

components/cdm/renderer/widevine_key_system_properties.cc

 // Copyright 2016 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 "components/cdm/renderer/widevine_key_system_properties.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 
@@ skipping 21 matching lines @@
     return EmeRobustness::HW_SECURE_DECODE;
   if (robustness == "HW_SECURE_ALL")
     return EmeRobustness::HW_SECURE_ALL;
   return EmeRobustness::INVALID;
 }
 
 }  // namespace
 
 WidevineKeySystemProperties::WidevineKeySystemProperties(
     media::SupportedCodecs supported_codecs,
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
     media::SupportedCodecs supported_secure_codecs,
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
     media::EmeRobustness max_audio_robustness,
     media::EmeRobustness max_video_robustness,
     media::EmeSessionTypeSupport persistent_license_support,
     media::EmeSessionTypeSupport persistent_release_message_support,
     media::EmeFeatureSupport persistent_state_support,
     media::EmeFeatureSupport distinctive_identifier_support)
     : supported_codecs_(supported_codecs),
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
       supported_secure_codecs_(supported_secure_codecs),
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
       max_audio_robustness_(max_audio_robustness),
       max_video_robustness_(max_video_robustness),
       persistent_license_support_(persistent_license_support),
       persistent_release_message_support_(persistent_release_message_support),
       persistent_state_support_(persistent_state_support),
       distinctive_identifier_support_(distinctive_identifier_support) {
 }
 
 std::string WidevineKeySystemProperties::GetKeySystemName() const {
   return kWidevineKeySystem;
@@ skipping 11 matching lines @@
     return (supported_codecs_ & media::EME_CODEC_MP4_ALL) != 0;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
   return false;
 }
 
 SupportedCodecs WidevineKeySystemProperties::GetSupportedCodecs() const {
   return supported_codecs_;
 }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
 SupportedCodecs WidevineKeySystemProperties::GetSupportedSecureCodecs() const {
   return supported_secure_codecs_;
 }
-#endif
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
 
 EmeConfigRule WidevineKeySystemProperties::GetRobustnessConfigRule(
     EmeMediaType media_type,
     const std::string& requested_robustness) const {
   EmeRobustness robustness = ConvertRobustness(requested_robustness);
   if (robustness == EmeRobustness::INVALID)
     return EmeConfigRule::NOT_SUPPORTED;
 
   EmeRobustness max_robustness = EmeRobustness::INVALID;
   switch (media_type) {
@@ skipping 27 matching lines @@
     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)
+#elif BUILDFLAG(ENABLE_HW_SECURE_CODEC)

[jrummell, 2016/05/24 18:27:50]

Should this be it's own #if (so #endif // OS_CHROMEOS, #if
ENABLE_HW_SECURE_CODEC)? I don't see any restriction that CrOS can't use secure
codecs in the future. 

[yucliu1, 2016/05/24 21:22:36]

Done.

   // Require hardware secure codecs when SW_SECURE_DECODE or above is specified.
   if (robustness >= EmeRobustness::SW_SECURE_DECODE) {
     return EmeConfigRule::HW_SECURE_CODECS_REQUIRED;
   }
 #endif  // defined(OS_CHROMEOS)
 
   return EmeConfigRule::SUPPORTED;
 }
 
 EmeSessionTypeSupport
@@ skipping 18 matching lines @@
 
 #if defined(ENABLE_PEPPER_CDMS)
 std::string WidevineKeySystemProperties::GetPepperType() const {
   return kWidevineCdmPluginMimeType;
 }
 #endif
 
 }  // namespace cdm
 
 #endif  // WIDEVINE_CDM_AVAILABLE