media: Pass AndroidOverlayMojoFactoryCB to StarboardRenderer (youtube#6461)

Passes `AndroidOverlayMojoFactoryCB` to `StarboardRenderer` from
`GpuMojoMediaClient` so that `StarboardRenderer` can create
`AndroidOverlay`.

Issue: 429257581

Author: jxqu2048

media/mojo/services/gpu_mojo_media_client.cc

@@ -120,7 +120,9 @@ StarboardRendererTraits::StarboardRendererTraits(
         renderer_extension_receiver,
     mojo::PendingRemote<mojom::StarboardRendererClientExtension>
         client_extension_remote,
-    GetStarboardCommandBufferStubCB get_starboard_command_buffer_stub_cb)
+    GetStarboardCommandBufferStubCB get_starboard_command_buffer_stub_cb,
+    AndroidOverlayMojoFactoryCB android_overlay_factory_cb
+  )
     : task_runner(std::move(task_runner)),
       gpu_task_runner(std::move(gpu_task_runner)),
       media_log_remote(std::move(media_log_remote)),
@@ -131,7 +133,8 @@ StarboardRendererTraits::StarboardRendererTraits(
       renderer_extension_receiver(std::move(renderer_extension_receiver)),
       client_extension_remote(std::move(client_extension_remote)),
       get_starboard_command_buffer_stub_cb(
-          std::move(get_starboard_command_buffer_stub_cb)) {}
+          std::move(get_starboard_command_buffer_stub_cb)),
+      android_overlay_factory_cb(std::move(android_overlay_factory_cb)) {}
 #endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
 
 GpuMojoMediaClient::GpuMojoMediaClient(
@@ -296,7 +299,8 @@ std::unique_ptr<Renderer> GpuMojoMediaClient::CreateStarboardRenderer(
       config.audio_write_duration_remote, config.max_video_capabilities,
       std::move(renderer_extension_receiver),
       std::move(client_extension_remote), base::BindRepeating(
-        &GetCommandBufferStub, gpu_task_runner_, media_gpu_channel_manager_));
+        &GetCommandBufferStub, gpu_task_runner_, media_gpu_channel_manager_),
+      android_overlay_factory_cb_);
   return CreatePlatformStarboardRenderer(std::move(traits));
 }
 #endif  // BUILDFLAG(USE_STARBOARD_MEDIA)

media/mojo/services/gpu_mojo_media_client.h

@@ -149,6 +149,9 @@ struct StarboardRendererTraits {
 
   // StarboardRenderer uses this to post tasks on gpu thread.
   GetStarboardCommandBufferStubCB get_starboard_command_buffer_stub_cb;
+  
+  // StarboardRenderer uses this to create an AndroidOverlay.
+  AndroidOverlayMojoFactoryCB android_overlay_factory_cb;
 
   StarboardRendererTraits(
       scoped_refptr<base::SequencedTaskRunner> task_runner,
@@ -163,7 +166,9 @@ struct StarboardRendererTraits {
       mojo::PendingRemote<mojom::StarboardRendererClientExtension>
           client_extension_remote,
       GetStarboardCommandBufferStubCB
-          get_starboard_command_buffer_stub_cb);
+          get_starboard_command_buffer_stub_cb,
+      AndroidOverlayMojoFactoryCB android_overlay_factory_cb
+    );
   StarboardRendererTraits(StarboardRendererTraits&& that) = default;
   ~StarboardRendererTraits();
 };

media/mojo/services/starboard/starboard_renderer_wrapper.cc

@@ -38,7 +38,12 @@ StarboardRendererWrapper::StarboardRendererWrapper(
           traits.overlay_plane_id,
           traits.audio_write_duration_local,
           traits.audio_write_duration_remote,
-          traits.max_video_capabilities) {
+          traits.max_video_capabilities
+#if BUILDFLAG(IS_ANDROID)
+          ,
+          std::move(traits.android_overlay_factory_cb)
+#endif  // BUILDFLAG(IS_ANDROID)
+      ) {
   DETACH_FROM_THREAD(thread_checker_);
   base::SequenceBound<StarboardGpuFactoryImpl> gpu_factory_impl(
       traits.gpu_task_runner,

media/mojo/services/starboard/starboard_renderer_wrapper.h

@@ -32,6 +32,10 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
+#if BUILDFLAG(IS_ANDROID)
+#include "media/base/android_overlay_mojo_factory.h"
+#endif  // BUILDFLAG(IS_ANDROID)
+
 namespace base {
 class TimeDelta;
 }  // namespace base

media/mojo/services/starboard/starboard_renderer_wrapper_unittest.cc

@@ -51,13 +51,24 @@ class MockStarboardRenderer : public StarboardRenderer {
       const base::UnguessableToken& overlay_plane_id,
       TimeDelta audio_write_duration_local,
       TimeDelta audio_write_duration_remote,
-      const std::string& max_video_capabilities)
+      const std::string& max_video_capabilities
+#if BUILDFLAG(IS_ANDROID)
+      ,
+      const AndroidOverlayMojoFactoryCB android_overlay_factory_cb
+#endif  // BUILDFLAG(IS_ANDROID)
+      )
       : StarboardRenderer(task_runner,
                           std::move(media_log),
                           overlay_plane_id,
                           audio_write_duration_local,
                           audio_write_duration_remote,
-                          max_video_capabilities) {}
+                          max_video_capabilities
+#if BUILDFLAG(IS_ANDROID)
+                          ,
+                          android_overlay_factory_cb
+#endif  // BUILDFLAG(IS_ANDROID)
+        ) {
+  }
 
   MockStarboardRenderer(const MockStarboardRenderer&) = delete;
   MockStarboardRenderer& operator=(const MockStarboardRenderer&) = delete;
@@ -135,7 +146,12 @@ class StarboardRendererWrapperTest : public testing::Test {
             base::UnguessableToken::Create(),
             base::Seconds(1),
             base::Seconds(1),
-            std::string())),
+            std::string()
+#if BUILDFLAG(IS_ANDROID)
+                ,
+            AndroidOverlayMojoFactoryCB()
+#endif  // BUILDFLAG(IS_ANDROID)
+                )),
         mock_gpu_factory_(task_environment_.GetMainThreadTaskRunner()) {
     // Setup MockStarboardGpuFactory as StarboardGpuFactory so
     // it can overwrite |gpu_factory_| in StarboardRendererWrapper
@@ -153,7 +169,8 @@ class StarboardRendererWrapperTest : public testing::Test {
         std::move(media_log_remote), base::UnguessableToken::Create(),
         base::Seconds(1), base::Seconds(1), std::string(),
         std::move(renderer_extension_receiver),
-        std::move(client_extension_remote), base::NullCallback());
+        std::move(client_extension_remote), base::NullCallback(),
+        AndroidOverlayMojoFactoryCB());
     renderer_wrapper_ =
         std::make_unique<StarboardRendererWrapper>(std::move(traits));
     renderer_wrapper_->SetRendererForTesting(mock_renderer_.get());

media/starboard/starboard_renderer.cc

@@ -114,7 +114,12 @@ StarboardRenderer::StarboardRenderer(
     const base::UnguessableToken& overlay_plane_id,
     TimeDelta audio_write_duration_local,
     TimeDelta audio_write_duration_remote,
-    const std::string& max_video_capabilities)
+    const std::string& max_video_capabilities
+#if BUILDFLAG(IS_ANDROID)
+    ,
+    const AndroidOverlayMojoFactoryCB android_overlay_factory_cb
+#endif  // BUILDFLAG(IS_ANDROID)
+    )
     : state_(STATE_UNINITIALIZED),
       task_runner_(task_runner),
       media_log_(std::move(media_log)),
@@ -123,7 +128,12 @@ StarboardRenderer::StarboardRenderer(
       buffering_state_(BUFFERING_HAVE_NOTHING),
       audio_write_duration_local_(audio_write_duration_local),
       audio_write_duration_remote_(audio_write_duration_remote),
-      max_video_capabilities_(max_video_capabilities) {
+      max_video_capabilities_(max_video_capabilities)
+#if BUILDFLAG(IS_ANDROID)
+      ,
+      android_overlay_factory_cb_(std::move(android_overlay_factory_cb))
+#endif  // BUILDFLAG(IS_ANDROID)
+{
   DCHECK(task_runner_);
   DCHECK(media_log_);
   DCHECK(set_bounds_helper_);
@@ -215,6 +225,8 @@ void StarboardRenderer::Initialize(MediaResource* media_resource,
 
   // |init_cb| will be called inside |CreatePlayerBridge()|.
   state_ = STATE_INITIALIZING;
+
+  // TODO: b/429435008 - Allow StarboardRenderer to request AndroidOverlay.
   CreatePlayerBridge();
 }
 

media/starboard/starboard_renderer.h

@@ -35,6 +35,10 @@
 #include "media/starboard/sbplayer_set_bounds_helper.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
+#if BUILDFLAG(IS_ANDROID)
+#include "media/base/android_overlay_mojo_factory.h"
+#endif  // BUILDFLAG(IS_ANDROID)
+
 namespace media {
 using base::Time;
 using base::TimeDelta;
@@ -51,7 +55,12 @@ class MEDIA_EXPORT StarboardRenderer : public Renderer,
                     const base::UnguessableToken& overlay_plane_id,
                     TimeDelta audio_write_duration_local,
                     TimeDelta audio_write_duration_remote,
-                    const std::string& max_video_capabilities);
+                    const std::string& max_video_capabilities
+#if BUILDFLAG(IS_ANDROID)
+                    ,
+                    const AndroidOverlayMojoFactoryCB android_overlay_factory_cb
+#endif  // BUILDFLAG(IS_ANDROID)
+  );
 
   // Disallow copy and assign.
   StarboardRenderer(const StarboardRenderer&) = delete;
@@ -176,6 +185,9 @@ class MEDIA_EXPORT StarboardRenderer : public Renderer,
   const TimeDelta audio_write_duration_local_;
   const TimeDelta audio_write_duration_remote_;
   const std::string max_video_capabilities_;
+#if BUILDFLAG(IS_ANDROID)
+  const AndroidOverlayMojoFactoryCB android_overlay_factory_cb_;
+#endif  // BUILDFLAG(IS_ANDROID)
 
   raw_ptr<DemuxerStream> audio_stream_ = nullptr;
   raw_ptr<DemuxerStream> video_stream_ = nullptr;

media/starboard/starboard_renderer_unittest.cc

@@ -181,7 +181,12 @@ class StarboardRendererTest : public testing::Test {
           /*overlay_plane_id=*/base::UnguessableToken::Create(),
           /*audio_write_duration_local=*/base::Seconds(1),
           /*audio_write_duration_remote=*/base::Seconds(1),
-          /*max_video_capabilities=*/"");
+          /*max_video_capabilities=*/""
+#if BUILDFLAG(IS_ANDROID)
+          ,
+          /*android_overlay_factory_cb=*/AndroidOverlayMojoFactoryCB()
+#endif  // BUILDFLAG(IS_ANDROID)
+      );
   base::MockOnceCallback<void(bool)> set_cdm_cb_;
   base::MockOnceCallback<void(PipelineStatus)> renderer_init_cb_;
   NiceMock<MockCdmContext> cdm_context_;