Allow hw secured codecs on chromecast

components/cdm/renderer/widevine_key_system_properties.h

 // 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.
 
 #ifndef COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEM_PROPERTIES_H_
 #define COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEM_PROPERTIES_H_
 
 #include "build/build_config.h"
 #include "media/base/key_system_properties.h"
+#include "media/media_features.h"
 
 namespace cdm {
 
 // Implementation of KeySystemProperties for Widevine key system.
 class WidevineKeySystemProperties : public media::KeySystemProperties {
  public:
   WidevineKeySystemProperties(
       media::SupportedCodecs supported_codecs,
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
       media::SupportedCodecs supported_secure_codecs,

[ddorwin, 2016/05/24 23:11:50]

As noted elsewhere, this was an Android specific thing. We don't use it on all
platforms that have secure codecs. Now that we have moved away from the Info
object, we might want to move to a different mechanism of providing
codec-robustness pairs.

For now, though, the build flag naming is misleading.

[yucliu1, 2016/05/25 00:43:21]

Is the *secure_codecs* here the same as *hw_secure_codecs*? If so, I think the
concept should be valid for all platforms supporting hw secured codecs.

[ddorwin, 2016/05/27 21:33:00]

I believe (on Android) `supported_secure_codecs` is the set of video codecs that
will be available if you set `use_hw_secure_codecs`. The fact that the
robustness affects the available codecs is currently unique to Android and
something we ignore on all other platforms (e.g. Chrome OS). If we want to
generalize this, we should do that as a separate CL and figure out what that
means.

xhwang and I will discuss offline next week.

-#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);
 
   std::string GetKeySystemName() const override;
   bool IsSupportedInitDataType(
       media::EmeInitDataType init_data_type) const override;
 
   media::SupportedCodecs GetSupportedCodecs() const override;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
   media::SupportedCodecs GetSupportedSecureCodecs() const override;
-#endif
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
 
   media::EmeConfigRule GetRobustnessConfigRule(
       media::EmeMediaType media_type,
       const std::string& requested_robustness) const override;
   media::EmeSessionTypeSupport GetPersistentLicenseSessionSupport()
       const override;
   media::EmeSessionTypeSupport GetPersistentReleaseMessageSessionSupport()
       const override;
   media::EmeFeatureSupport GetPersistentStateSupport() const override;
   media::EmeFeatureSupport GetDistinctiveIdentifierSupport() const override;
 
 #if defined(ENABLE_PEPPER_CDMS)
   std::string GetPepperType() const override;
 #endif
 
  private:
   const media::SupportedCodecs supported_codecs_;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
   const media::SupportedCodecs supported_secure_codecs_;
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
   const media::EmeRobustness max_audio_robustness_;
   const media::EmeRobustness max_video_robustness_;
   const media::EmeSessionTypeSupport persistent_license_support_;
   const media::EmeSessionTypeSupport persistent_release_message_support_;
   const media::EmeFeatureSupport persistent_state_support_;
   const media::EmeFeatureSupport distinctive_identifier_support_;
 };
 
 }  // namespace cdm
 
 #endif  // COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEM_PROPERTIES_H_