EME contentType checks for AC3/EAC3

chromecast/renderer/media/key_systems_cast.cc

 // Copyright 2014 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 "chromecast/renderer/media/key_systems_cast.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 using ::media::EmeFeatureSupport;
 using ::media::EmeInitDataType;
 using ::media::EmeMediaType;
 using ::media::EmeSessionTypeSupport;
 using ::media::SupportedCodecs;
 
 namespace chromecast {
 namespace media {
 namespace {
 
+#if defined(PLAYREADY_CDM_AVAILABLE) || \
+    (defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_ANDROID))
+SupportedCodecs GetCastEmeSupportedCodecs() {
+  SupportedCodecs codecs =
+      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
+      ::media::EME_CODEC_COMMON_VP9 | ::media::EME_CODEC_WEBM_VP8 |
+      ::media::EME_CODEC_WEBM_VP9;
+
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+  codecs |= ::media::EME_CODEC_MP4_HEVC;
+#endif  // BUILDFLAG(ENABLE_HEVC_DEMUXING)
+
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+  codecs |= ::media::EME_CODEC_MP4_DV_AVC;
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+  codecs |= ::media::EME_CODEC_MP4_DV_HEVC;
+#endif  // BUILDFLAG(ENABLE_HEVC_DEMUXING)
+#endif  // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+
+#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+  codecs |= ::media::EME_CODEC_MP4_AC3 | ::media::EME_CODEC_MP4_EAC3;
+#endif  // BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+
+  return codecs;
+}
+#endif
+
 #if defined(PLAYREADY_CDM_AVAILABLE)
 class PlayReadyKeySystemProperties : public ::media::KeySystemProperties {
  public:
   explicit PlayReadyKeySystemProperties(bool persistent_license_support)
       : persistent_license_support_(persistent_license_support) {}
 
   std::string GetKeySystemName() const override {
     return media::kChromecastPlayreadyKeySystem;
   }
 
   bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override {
     return init_data_type == EmeInitDataType::CENC;
   }
 
   SupportedCodecs GetSupportedCodecs() const override {
-    SupportedCodecs codecs =
-        ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-    codecs |= ::media::EME_CODEC_MP4_HEVC;
-#endif
-#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
-    codecs |= ::media::EME_CODEC_MP4_DV_AVC;
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-    codecs |= ::media::EME_CODEC_MP4_DV_HEVC;
-#endif
-#endif
-    return codecs;
+    return GetCastEmeSupportedCodecs();
   }
 
   EmeConfigRule GetRobustnessConfigRule(
       EmeMediaType media_type,
       const std::string& requested_robustness) const override {
     return requested_robustness.empty() ? EmeConfigRule::SUPPORTED
                                         : EmeConfigRule::NOT_SUPPORTED;
   }
 
   EmeSessionTypeSupport GetPersistentLicenseSessionSupport() const override {
@@ skipping 34 matching lines @@
 #endif
   key_systems_properties->emplace_back(
       new PlayReadyKeySystemProperties(enable_persistent_license_playready));
 #endif  // defined(PLAYREADY_CDM_AVAILABLE)
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(OS_ANDROID)
   cdm::AddAndroidWidevine(key_systems_properties);
 #else
   using Robustness = cdm::WidevineKeySystemProperties::Robustness;
-  ::media::SupportedCodecs codecs =
-      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
-      ::media::EME_CODEC_MP4_VP9 | ::media::EME_CODEC_WEBM_VP8 |
-      ::media::EME_CODEC_WEBM_VP9;
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  codecs |= ::media::EME_CODEC_MP4_HEVC;
-#endif
-#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
-  codecs |= ::media::EME_CODEC_MP4_DV_AVC;
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  codecs |= ::media::EME_CODEC_MP4_DV_HEVC;
-#endif
-#endif
+
+  SupportedCodecs codecs = GetCastEmeSupportedCodecs();
+
   key_systems_properties->emplace_back(new cdm::WidevineKeySystemProperties(
       codecs,                     // Regular codecs.
       Robustness::HW_SECURE_ALL,  // Max audio robustness.
       Robustness::HW_SECURE_ALL,  // Max video robustness.
       enable_persistent_license_support
           ? EmeSessionTypeSupport::SUPPORTED
           : EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
       EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
       // Note: On Chromecast, all CDMs may have persistent state.
       EmeFeatureSupport::ALWAYS_ENABLED,    // Persistent state.
       EmeFeatureSupport::ALWAYS_ENABLED));  // Distinctive identifier.
 #endif  // defined(OS_ANDROID)
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 }
 
 }  // namespace media
 }  // namespace chromecast