Simplify/Cleanup MediaClient

chromecast/renderer/cast_content_renderer_client.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/cast_content_renderer_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chromecast/base/chromecast_switches.h"
-#include "chromecast/common/media/cast_media_client.h"
 #include "chromecast/crash/cast_crash_keys.h"
+#include "chromecast/media/base/media_caps.h"
+#include "chromecast/media/base/media_codec_support.h"
 #include "chromecast/media/base/supported_codec_profile_levels_memo.h"
+#include "chromecast/public/media/media_capabilities_shlib.h"
 #include "chromecast/renderer/cast_render_frame_action_deferrer.h"
-#include "chromecast/renderer/key_systems_cast.h"
+#include "chromecast/renderer/media/key_systems_cast.h"
 #include "chromecast/renderer/media/media_caps_observer_impl.h"
 #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "media/base/media.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
@@ skipping 42 matching lines @@
   // Register as observer for media capabilities
   content::RenderThread* thread = content::RenderThread::Get();
   media::mojom::MediaCapsPtr media_caps;
   thread->GetConnector()->BindInterface(content::mojom::kBrowserServiceName,
                                         &media_caps);
   media::mojom::MediaCapsObserverPtr proxy;
   media_caps_observer_.reset(
       new media::MediaCapsObserverImpl(&proxy, supported_profiles_.get()));
   media_caps->AddObserver(std::move(proxy));
 
-  chromecast::media::CastMediaClient::Initialize(supported_profiles_.get());
-
   prescient_networking_dispatcher_.reset(
       new network_hints::PrescientNetworkingDispatcher());
 
   std::string last_launched_app =
       command_line->GetSwitchValueNative(switches::kLastLaunchedApp);
   if (!last_launched_app.empty())
     base::debug::SetCrashKeyValue(crash_keys::kLastApp, last_launched_app);
 
   std::string previous_app =
       command_line->GetSwitchValueNative(switches::kPreviousApp);
@@ skipping 10 matching lines @@
 
     // Disable application cache as Chromecast doesn't support off-line
     // application running.
     webview->settings()->setOfflineWebApplicationCacheEnabled(false);
   }
 }
 
 void CastContentRendererClient::AddSupportedKeySystems(
     std::vector<std::unique_ptr<::media::KeySystemProperties>>*
         key_systems_properties) {
-  AddChromecastKeySystems(key_systems_properties,
-                          false /* enable_persistent_license_support */,
-                          false /* force_software_crypto */);
+  media::AddChromecastKeySystems(key_systems_properties,
+                                 false /* enable_persistent_license_support */,
+                                 false /* force_software_crypto */);
+}
+
+bool CastContentRendererClient::IsSupportedAudioConfig(
+    const ::media::AudioConfig& config) {
+#if defined(OS_ANDROID)
+  // TODO(sanfin): Implement this for Android.
+  return true;
+#else
+  media::AudioCodec codec = media::ToCastAudioCodec(config.codec);
+  // Cast platform implements software decoding of Opus and FLAC, so only PCM
+  // support is necessary in order to support Opus and FLAC.
+  if (codec == media::kCodecOpus || codec == media::kCodecFLAC)
+    codec = media::kCodecPCM;
+
+  // If HDMI sink supports AC3/EAC3 codecs then we don't need the vendor backend
+  // to support these codec directly.
+  if (codec == media::kCodecEAC3 &&
+      media::MediaCapabilities::HdmiSinkSupportsEAC3())
+    return true;
+  if (codec == media::kCodecAC3 &&
+      media::MediaCapabilities::HdmiSinkSupportsAC3())
+    return true;
+
+  media::AudioConfig cast_audio_config;
+  cast_audio_config.codec = codec;
+  return media::MediaCapabilitiesShlib::IsSupportedAudioConfig(
+      cast_audio_config);
+#endif
+}
+
+bool CastContentRendererClient::IsSupportedVideoConfig(
+    const ::media::VideoConfig& config) {
+// TODO(servolk): make use of eotf.
+#if defined(OS_ANDROID)
+  return supported_profiles_->IsSupportedVideoConfig(
+      media::ToCastVideoCodec(config.codec, config.profile),
+      media::ToCastVideoProfile(config.profile), config.level);
+#else
+  return media::MediaCapabilitiesShlib::IsSupportedVideoConfig(
+      media::ToCastVideoCodec(config.codec, config.profile),
+      media::ToCastVideoProfile(config.profile), config.level);
+#endif
 }
 
 blink::WebPrescientNetworking*
 CastContentRendererClient::GetPrescientNetworking() {
   return prescient_networking_dispatcher_.get();
 }
 
 void CastContentRendererClient::DeferMediaLoad(
     content::RenderFrame* render_frame,
     bool render_frame_has_played_media_before,
@@ skipping 23 matching lines @@
 }
 
 void CastContentRendererClient::
     SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {
   // Settings for ATV (Android defaults are not what we want).
   blink::WebRuntimeFeatures::enableMediaControlsOverlayPlayButton(false);
 }
 
 }  // namespace shell
 }  // namespace chromecast