[media] Send maxVideoCapabilities to StarboardRenderer (#5756)

johnedocampo · web-flow · commit d7a2be9c132c · 2025-05-20T13:07:49.000-07:00
Send non-standard API HTMLVideoElement extension maxVideoCapabilities from the HTML Video Element to StarboardRenderer. This change allows StarboardRenderer to use the HTMLVideoElement extension maxVideoCapabilities to set a video stream with the specified maximums described in maxVideoCapabilities. To learn more about the extension itself and its use cases, please refer to the commit that included this extension at youtube/cobalt@6c593e0 b/326827007
diff --git a/content/renderer/media/media_factory.cc b/content/renderer/media/media_factory.cc
@@ -443,7 +443,12 @@ blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
       render_frame_->GetRenderFrameMediaPlaybackOptions(),
       decoder_factory_.get(),
       std::make_unique<blink::RemotePlaybackClientWrapperImpl>(client),
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+      &media_observer, client->GetElementId(), 
+      client->getMaxVideoCapabilities());
+#else // BUILDFLAG(USE_STARBOARD_MEDIA)
       &media_observer, client->GetElementId());
+#endif // BUILDFLAG(USE_STARBOARD_MEDIA)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   DCHECK(media_observer);
@@ -548,7 +553,11 @@ MediaFactory::CreateRendererFactorySelector(
     media::DecoderFactory* decoder_factory,
     std::unique_ptr<media::RemotePlaybackClientWrapper> client_wrapper,
     base::WeakPtr<media::MediaObserver>* out_media_observer,
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+    int element_id, const std::string& max_video_capabilities) {
+#else // BUILDFLAG(USE_STARBOARD_MEDIA)
     int element_id) {
+#endif // BUILDFLAG(USE_STARBOARD_MEDIA)
   using media::RendererType;
 
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
@@ -619,9 +628,9 @@ MediaFactory::CreateRendererFactorySelector(
 
 #if BUILDFLAG(ENABLE_MOJO_RENDERER)
 #if BUILDFLAG(USE_STARBOARD_MEDIA)
-  // TODO(b/326827007): Revisit renderer to support secondary videos.
   media::RendererFactoryTraits renderer_factory_traits;
   GetContentClient()->renderer()->GetStarboardRendererFactoryTraits(&renderer_factory_traits);
+  renderer_factory_traits.max_video_capabilities = max_video_capabilities;
   is_base_renderer_factory_set = true;
   factory_selector->AddBaseFactory(RendererType::kStarboard,
     std::make_unique<media::StarboardRendererClientFactory>(media_log,
diff --git a/content/renderer/media/media_factory.h b/content/renderer/media/media_factory.h
@@ -132,7 +132,11 @@ class MediaFactory {
       media::DecoderFactory* decoder_factory,
       std::unique_ptr<media::RemotePlaybackClientWrapper> client_wrapper,
       base::WeakPtr<media::MediaObserver>* out_media_observer,
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+      int element_id, const std::string& max_video_capabilities);
+#else // BUILDFLAG(USE_STARBOARD_MEDIA)
       int element_id);
+#endif // BUILDFLAG(USE_STARBOARD_MEDIA)
 
   blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream(
       blink::WebMediaPlayerClient* client,
diff --git a/media/base/ipc/media_param_traits_macros.h b/media/base/ipc/media_param_traits_macros.h
@@ -230,6 +230,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::StarboardRendererConfig)
   IPC_STRUCT_TRAITS_MEMBER(overlay_plane_id)
   IPC_STRUCT_TRAITS_MEMBER(audio_write_duration_local)
   IPC_STRUCT_TRAITS_MEMBER(audio_write_duration_remote)
+  IPC_STRUCT_TRAITS_MEMBER(max_video_capabilities)
 IPC_STRUCT_TRAITS_END()
 #endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
 
diff --git a/media/base/starboard/renderer_factory_traits.h b/media/base/starboard/renderer_factory_traits.h
@@ -31,6 +31,7 @@ struct MEDIA_EXPORT RendererFactoryTraits {
 
   base::TimeDelta audio_write_duration_local = kNoTimestamp;
   base::TimeDelta audio_write_duration_remote = kNoTimestamp;
+  std::string max_video_capabilities;
   BindHostReceiverCallback bind_host_receiver_callback = base::NullCallback();
 };
 
diff --git a/media/base/starboard/starboard_renderer_config.cc b/media/base/starboard/starboard_renderer_config.cc
@@ -25,9 +25,11 @@ StarboardRendererConfig& StarboardRendererConfig::operator=(
 StarboardRendererConfig::StarboardRendererConfig(
     const base::UnguessableToken& overlay_plane_id,
     base::TimeDelta audio_write_duration_local,
-    base::TimeDelta audio_write_duration_remote)
+    base::TimeDelta audio_write_duration_remote,
+    const std::string& max_video_capabilities)
     : overlay_plane_id(overlay_plane_id),
       audio_write_duration_local(audio_write_duration_local),
-      audio_write_duration_remote(audio_write_duration_remote) {}
+      audio_write_duration_remote(audio_write_duration_remote),
+      max_video_capabilities(max_video_capabilities) {}
 
 }  // namespace media
diff --git a/media/base/starboard/starboard_renderer_config.h b/media/base/starboard/starboard_renderer_config.h
@@ -15,6 +15,8 @@
 #ifndef MEDIA_BASE_STARBOARD_STARBOARD_RENDERER_CONFIG_H_
 #define MEDIA_BASE_STARBOARD_STARBOARD_RENDERER_CONFIG_H_
 
+#include <string>
+
 #include "base/time/time.h"
 #include "base/unguessable_token.h"
 #include "media/base/media_export.h"
@@ -26,13 +28,15 @@ struct MEDIA_EXPORT StarboardRendererConfig {
   StarboardRendererConfig();
   StarboardRendererConfig(const base::UnguessableToken& overlay_plane_id,
                           base::TimeDelta audio_write_duration_local,
-                          base::TimeDelta audio_write_duration_remote);
+                          base::TimeDelta audio_write_duration_remote,
+                          const std::string& max_video_capabilities);
   StarboardRendererConfig(const StarboardRendererConfig&);
   StarboardRendererConfig& operator=(const StarboardRendererConfig&);
 
   base::UnguessableToken overlay_plane_id;
   base::TimeDelta audio_write_duration_local;
   base::TimeDelta audio_write_duration_remote;
+  std::string max_video_capabilities;
 };
 
 }  // namespace media
diff --git a/media/base/starboard/starboard_renderer_config_unittest.cc b/media/base/starboard/starboard_renderer_config_unittest.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include "media/base/starboard/starboard_renderer_config.h"
+
+#include <string>
+
 #include "base/time/time.h"
 #include "base/unguessable_token.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -24,11 +27,14 @@ TEST(StarboardRendererConfigTest, SunnyDay) {
       base::Microseconds(500000);
   constexpr base::TimeDelta audio_write_duration_remote =
       base::Microseconds(100000);
-  StarboardRendererConfig config(base::UnguessableToken::Create(),
-                                 audio_write_duration_local,
-                                 audio_write_duration_remote);
+  const std::string max_video_capabilities =
+      "width=1920; height=1080; framerate=15;";
+  StarboardRendererConfig config(
+      base::UnguessableToken::Create(), audio_write_duration_local,
+      audio_write_duration_remote, max_video_capabilities);
   EXPECT_EQ(config.audio_write_duration_local, audio_write_duration_local);
   EXPECT_EQ(config.audio_write_duration_remote, audio_write_duration_remote);
+  EXPECT_EQ(config.max_video_capabilities, max_video_capabilities);
 }
 
 }  // namespace media
diff --git a/media/mojo/clients/starboard/starboard_renderer_client_factory.cc b/media/mojo/clients/starboard/starboard_renderer_client_factory.cc
@@ -43,6 +43,7 @@ StarboardRendererClientFactory::StarboardRendererClientFactory(
       get_gpu_factories_cb_(get_gpu_factories_cb),
       audio_write_duration_local_(traits->audio_write_duration_local),
       audio_write_duration_remote_(traits->audio_write_duration_remote),
+      max_video_capabilities_(traits->max_video_capabilities),
       bind_host_receiver_callback_(traits->bind_host_receiver_callback) {}
 
 StarboardRendererClientFactory::~StarboardRendererClientFactory() = default;
@@ -92,9 +93,9 @@ std::unique_ptr<Renderer> StarboardRendererClientFactory::CreateRenderer(
   GpuVideoAcceleratorFactories* gpu_factories = get_gpu_factories_cb_.Run();
 
   // Initialize StarboardRendererWrapper via StarboardRendererConfig.
-  StarboardRendererConfig config(overlay_factory->overlay_plane_id(),
-                                 audio_write_duration_local_,
-                                 audio_write_duration_remote_);
+  StarboardRendererConfig config(
+      overlay_factory->overlay_plane_id(), audio_write_duration_local_,
+      audio_write_duration_remote_, max_video_capabilities_);
   std::unique_ptr<media::MojoRenderer> mojo_renderer =
       mojo_renderer_factory_->CreateStarboardRenderer(
           std::move(media_log_pending_remote), config,
diff --git a/media/mojo/clients/starboard/starboard_renderer_client_factory.h b/media/mojo/clients/starboard/starboard_renderer_client_factory.h
@@ -69,6 +69,7 @@ class MEDIA_EXPORT StarboardRendererClientFactory final
   GetGpuFactoriesCB get_gpu_factories_cb_;
   const base::TimeDelta audio_write_duration_local_;
   const base::TimeDelta audio_write_duration_remote_;
+  const std::string max_video_capabilities_;
   const BindHostReceiverCallback bind_host_receiver_callback_;
 };
 
diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
@@ -114,6 +114,7 @@ StarboardRendererTraits::StarboardRendererTraits(
     const base::UnguessableToken& overlay_plane_id,
     base::TimeDelta audio_write_duration_local,
     base::TimeDelta audio_write_duration_remote,
+    const std::string& max_video_capabilities,
     mojo::PendingReceiver<mojom::StarboardRendererExtension>
         renderer_extension_receiver,
     mojo::PendingRemote<mojom::StarboardRendererClientExtension>
@@ -123,6 +124,7 @@ StarboardRendererTraits::StarboardRendererTraits(
       overlay_plane_id(overlay_plane_id),
       audio_write_duration_local(audio_write_duration_local),
       audio_write_duration_remote(audio_write_duration_remote),
+      max_video_capabilities(max_video_capabilities),
       renderer_extension_receiver(std::move(renderer_extension_receiver)),
       client_extension_remote(std::move(client_extension_remote)) {}
 #endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
@@ -286,6 +288,7 @@ std::unique_ptr<Renderer> GpuMojoMediaClient::CreateStarboardRenderer(
   StarboardRendererTraits traits(std::move(task_runner),
       std::move(media_log_remote), config.overlay_plane_id,
       config.audio_write_duration_local, config.audio_write_duration_remote,
+      config.max_video_capabilities,
       std::move(renderer_extension_receiver),
       std::move(client_extension_remote));
   return CreatePlatformStarboardRenderer(traits);
diff --git a/media/mojo/services/gpu_mojo_media_client.h b/media/mojo/services/gpu_mojo_media_client.h
@@ -134,6 +134,7 @@ struct StarboardRendererTraits {
   const base::UnguessableToken& overlay_plane_id;
   base::TimeDelta audio_write_duration_local;
   base::TimeDelta audio_write_duration_remote;
+  const std::string& max_video_capabilities;
   mojo::PendingReceiver<mojom::StarboardRendererExtension>
         renderer_extension_receiver;
   mojo::PendingRemote<mojom::StarboardRendererClientExtension>
@@ -145,6 +146,7 @@ struct StarboardRendererTraits {
       const base::UnguessableToken& overlay_plane_id,
       base::TimeDelta audio_write_duration_local,
       base::TimeDelta audio_write_duration_remote,
+      const std::string& max_video_capabilities,
       mojo::PendingReceiver<mojom::StarboardRendererExtension>
           renderer_extension_receiver,
       mojo::PendingRemote<mojom::StarboardRendererClientExtension>
diff --git a/media/mojo/services/media_service_unittest.cc b/media/mojo/services/media_service_unittest.cc
@@ -143,7 +143,8 @@ class MediaServiceTest : public testing::Test {
 #if BUILDFLAG(USE_STARBOARD_MEDIA)
   StarboardRendererConfig config(base::UnguessableToken::Create(),
                                  base::Microseconds(0),
-                                 base::Microseconds(0));
+                                 base::Microseconds(0),
+                                 "width=1920; height=1080; framerate=15;");
     interface_factory_->CreateStarboardRenderer(
       media_log_.InitWithNewPipeAndPassRemote(),
       config, renderer_.BindNewPipeAndPassReceiver(),
diff --git a/media/mojo/services/starboard/starboard_renderer_wrapper.cc b/media/mojo/services/starboard/starboard_renderer_wrapper.cc
@@ -35,7 +35,8 @@ StarboardRendererWrapper::StarboardRendererWrapper(
                                          traits.task_runner),
           traits.overlay_plane_id,
           traits.audio_write_duration_local,
-          traits.audio_write_duration_remote)) {
+          traits.audio_write_duration_remote,
+          traits.max_video_capabilities)) {
   DETACH_FROM_THREAD(thread_checker_);
 }
 
diff --git a/media/starboard/starboard_renderer.cc b/media/starboard/starboard_renderer.cc
@@ -111,14 +111,16 @@ StarboardRenderer::StarboardRenderer(
     std::unique_ptr<MediaLog> media_log,
     const base::UnguessableToken& overlay_plane_id,
     TimeDelta audio_write_duration_local,
-    TimeDelta audio_write_duration_remote)
+    TimeDelta audio_write_duration_remote,
+    const std::string& max_video_capabilities)
     : state_(STATE_UNINITIALIZED),
       task_runner_(std::move(task_runner)),
       media_log_(std::move(media_log)),
       set_bounds_helper_(new SbPlayerSetBoundsHelper),
       cdm_context_(nullptr),
       audio_write_duration_local_(audio_write_duration_local),
-      audio_write_duration_remote_(audio_write_duration_remote) {
+      audio_write_duration_remote_(audio_write_duration_remote),
+      max_video_capabilities_(max_video_capabilities) {
   DCHECK(task_runner_);
   DCHECK(media_log_);
   DCHECK(set_bounds_helper_);
@@ -511,7 +513,9 @@ void StarboardRenderer::CreatePlayerBridge() {
               ? audio_write_duration_remote_
               : audio_write_duration_local_;
       LOG(INFO) << "SbPlayerBridge created, with audio write duration at "
-                << audio_write_duration_for_preroll_;
+                << audio_write_duration_for_preroll_
+                << " and with max_video_capabilities_ at "
+                << max_video_capabilities_;
     } else {
       error_message = player_bridge_->GetPlayerCreationErrorMessage();
       player_bridge_.reset();
diff --git a/media/starboard/starboard_renderer.h b/media/starboard/starboard_renderer.h
@@ -15,6 +15,7 @@
 #ifndef MEDIA_STARBOARD_STARBOARD_RENDERER_H_
 #define MEDIA_STARBOARD_STARBOARD_RENDERER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/memory/raw_ptr.h"
@@ -51,7 +52,8 @@ class MEDIA_EXPORT StarboardRenderer final : public Renderer,
                     std::unique_ptr<MediaLog> media_log,
                     const base::UnguessableToken& overlay_plane_id,
                     TimeDelta audio_write_duration_local,
-                    TimeDelta audio_write_duration_remote);
+                    TimeDelta audio_write_duration_remote,
+                    const std::string& max_video_capabilities);
 
   // Disallow copy and assign.
   StarboardRenderer(const StarboardRenderer&) = delete;
@@ -172,6 +174,7 @@ class MEDIA_EXPORT StarboardRenderer final : public Renderer,
 
   const TimeDelta audio_write_duration_local_;
   const TimeDelta audio_write_duration_remote_;
+  const std::string max_video_capabilities_;
   // The two variables below should always contain the same value.  They are
   // kept as separate variables so we can keep the existing implementation as
   // is, which simplifies the implementation across multiple Starboard versions.
