cobalt: Move VideoGeometrySetterService on gpu thread (#8962)

Relocate the VideoGeometrySetterService from the browser process to
the GPU process. This change instantiates the service within the
CobaltContentGpuClient, allowing it to be managed directly on the GPU
thread.

This improves performance and reduces IPC overhead for video geometry
updates by co-locating the service closer to the GPU and compositing
operations. The StarboardRendererWrapper now directly subscribes to
video geometry changes from this local service.

Mojo communications:
- Before: viz (gpu) --> browser thread --> StarboardRendererClient
(media) --> StarboardRendererWrapper (gpu)
- After: viz (gpu) --> StarboardRendererWrapper (gpu)

Note this is called nearly per UI frame update.

Issue: 405424096
(cherry picked from commit d1376b1)

Author: borongc

cobalt/browser/cobalt_content_browser_client.cc

@@ -36,9 +36,7 @@
 #include "cobalt/browser/metrics/cobalt_metrics_services_manager_client.h"
 #include "cobalt/browser/user_agent/user_agent_platform_info.h"
 #include "cobalt/common/features/starboard_features_initialization.h"
-#include "cobalt/media/service/mojom/video_geometry_setter.mojom.h"
 #include "cobalt/media/service/platform_window_provider_service.h"
-#include "cobalt/media/service/video_geometry_setter_service.h"
 #include "cobalt/shell/browser/shell.h"
 #include "cobalt/shell/browser/shell_paths.h"
 #include "cobalt/shell/common/shell_switches.h"
@@ -61,8 +59,6 @@
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/mojom/network_context.mojom.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
-#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 
 #if BUILDFLAG(USE_EVERGREEN)
@@ -155,6 +151,7 @@ blink::UserAgentMetadata GetCobaltUserAgentMetadata() {
   return metadata;
 }
 
+<<<<<<< HEAD
 CobaltContentBrowserClient::CobaltContentBrowserClient(bool is_visible)
     : is_visible_(is_visible),
       video_geometry_setter_service_(
@@ -163,6 +160,10 @@ CobaltContentBrowserClient::CobaltContentBrowserClient(bool is_visible)
               nullptr,
               base::OnTaskRunnerDeleter(nullptr))) {
   DETACH_FROM_THREAD(thread_checker_);
+=======
+CobaltContentBrowserClient::CobaltContentBrowserClient() {
+  COBALT_DETACH_FROM_THREAD(thread_checker_);
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962))
 #if BUILDFLAG(IS_STARBOARD)
   // TODO: b/476434249 - Revisit if Cobalt supports multiple tabs/windows.
   ui::PlatformWindowStarboard::SetWindowCreatedCallback(
@@ -378,6 +379,7 @@ void CobaltContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
       render_frame_host, map);
 }
 
+<<<<<<< HEAD
 void CobaltContentBrowserClient::CreateVideoGeometrySetterService() {
   DCHECK(!video_geometry_setter_service_);
   video_geometry_setter_service_ =
@@ -413,6 +415,9 @@ void CobaltContentBrowserClient::BindGpuHostReceiver(
 }
 
 bool CobaltContentBrowserClient::WillCreateURLLoaderFactory(
+=======
+void CobaltContentBrowserClient::WillCreateURLLoaderFactory(
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962))
     content::BrowserContext* browser_context,
     content::RenderFrameHost* frame,
     int render_process_id,

cobalt/browser/cobalt_content_browser_client.h

@@ -48,10 +48,6 @@ class BinderMapWithContext;
 
 namespace cobalt {
 
-namespace media {
-class VideoGeometrySetterService;
-}  // namespace media
-
 class CobaltMetricsServicesManagerClient;
 class CobaltWebContentsObserver;
 
@@ -103,11 +99,6 @@ class CobaltContentBrowserClient : public content::ShellContentBrowserClient {
       content::RenderFrameHost* render_frame_host,
       mojo::BinderMapWithContext<content::RenderFrameHost*>* binder_map)
       override;
-  void ExposeInterfacesToRenderer(
-      service_manager::BinderRegistry* registry,
-      blink::AssociatedInterfaceRegistry* associated_registry,
-      content::RenderProcessHost* render_process_host) override;
-  void BindGpuHostReceiver(mojo::GenericPendingReceiver receiver) override;
 
   // Initializes all necessary parameters to create the feature list and calls
   // base::FeatureList::SetInstance() to set the global instance.
@@ -144,13 +135,15 @@ class CobaltContentBrowserClient : public content::ShellContentBrowserClient {
 #endif  // !BUILDFLAG(IS_ANDROIDTV)
 
  private:
+<<<<<<< HEAD
   void CreateVideoGeometrySetterService();
+=======
+  void DispatchEvent(const std::string&, base::OnceClosure);
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962))
   void OnSbWindowCreated(SbWindow window);
 
   bool is_visible_;
   std::unique_ptr<CobaltWebContentsObserver> web_contents_observer_;
-  std::unique_ptr<media::VideoGeometrySetterService, base::OnTaskRunnerDeleter>
-      video_geometry_setter_service_;
 
   uint64_t cached_sb_window_ = 0;
   std::vector<

cobalt/gpu/BUILD.gn

@@ -20,6 +20,7 @@ source_set("gpu") {
 
   deps = [
     "//base",
+    "//cobalt/media/service",
     "//cobalt/media/service/mojom",
     "//components/viz/common",
     "//components/viz/service",

cobalt/gpu/cobalt_content_gpu_client.cc

@@ -16,23 +16,40 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/task/single_thread_task_runner.h"
+<<<<<<< HEAD
 #include "components/viz/service/display/starboard/overlay_strategy_underlay_starboard.h"
+=======
+#include "cobalt/media/service/mojom/video_geometry_setter.mojom.h"
+#include "cobalt/media/service/video_geometry_setter_service.h"
+#include "components/viz/service/display/starboard/video_geometry_setter.h"
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962))
 #include "content/public/child/child_thread.h"
 
 namespace cobalt {
 
-CobaltContentGpuClient::CobaltContentGpuClient() = default;
+CobaltContentGpuClient::CobaltContentGpuClient()
+    : video_geometry_setter_service_(
+          std::unique_ptr<cobalt::media::VideoGeometrySetterService,
+                          base::OnTaskRunnerDeleter>(
+              nullptr,
+              base::OnTaskRunnerDeleter(nullptr))) {}
+
 CobaltContentGpuClient::~CobaltContentGpuClient() = default;
 
 void CobaltContentGpuClient::PostCompositorThreadCreated(
     base::SingleThreadTaskRunner* task_runner) {
+  if (!video_geometry_setter_service_) {
+    CreateVideoGeometrySetterService();
+  }
   // Initialize PendingRemote for VideoGeometrySetter and post it
   // to compositor thread (viz service). This is called on gpu thread
   // right after the compositor thread is created.
   mojo::PendingRemote<cobalt::media::mojom::VideoGeometrySetter>
       video_geometry_setter;
-  content::ChildThread::Get()->BindHostReceiver(
-      video_geometry_setter.InitWithNewPipeAndPassReceiver());
+  mojo::PendingReceiver<cobalt::media::mojom::VideoGeometrySetter>
+      pending_receiver = video_geometry_setter.InitWithNewPipeAndPassReceiver();
+  video_geometry_setter_service_->GetVideoGeometrySetter(
+      std::move(pending_receiver));
 
   task_runner->PostTask(
       FROM_HERE,
@@ -41,4 +58,22 @@ void CobaltContentGpuClient::PostCompositorThreadCreated(
           std::move(video_geometry_setter)));
 }
 
+media::VideoGeometrySetterService*
+CobaltContentGpuClient::GetVideoGeometrySetterService() {
+  if (!video_geometry_setter_service_) {
+    CreateVideoGeometrySetterService();
+  }
+  return video_geometry_setter_service_.get();
+}
+
+void CobaltContentGpuClient::CreateVideoGeometrySetterService() {
+  DCHECK(!video_geometry_setter_service_);
+  video_geometry_setter_service_ =
+      std::unique_ptr<cobalt::media::VideoGeometrySetterService,
+                      base::OnTaskRunnerDeleter>(
+          new media::VideoGeometrySetterService,
+          base::OnTaskRunnerDeleter(
+              base::SingleThreadTaskRunner::GetCurrentDefault()));
+}
+
 }  // namespace cobalt

cobalt/gpu/cobalt_content_gpu_client.h

@@ -22,6 +22,10 @@
 
 namespace cobalt {
 
+namespace media {
+class VideoGeometrySetterService;
+}  // namespace media
+
 // This class utilizes embedder API for participating in gpu logic.
 // It allows Cobalt to interact with viz service and compositor thread.
 class CobaltContentGpuClient : public content::ContentGpuClient {
@@ -36,6 +40,13 @@ class CobaltContentGpuClient : public content::ContentGpuClient {
   // content::ContentGpuClient:
   void PostCompositorThreadCreated(
       base::SingleThreadTaskRunner* task_runner) override;
+  media::VideoGeometrySetterService* GetVideoGeometrySetterService() override;
+
+ private:
+  void CreateVideoGeometrySetterService();
+
+  std::unique_ptr<media::VideoGeometrySetterService, base::OnTaskRunnerDeleter>
+      video_geometry_setter_service_;
 };
 
 }  // namespace cobalt

cobalt/renderer/cobalt_content_renderer_client.cc

@@ -18,8 +18,6 @@
 #include "media/base/media_log.h"
 #include "media/base/renderer_factory.h"
 #include "media/mojo/clients/starboard/starboard_renderer_client_factory.h"
-#include "media/starboard/bind_host_receiver_callback.h"
-#include "mojo/public/cpp/bindings/generic_pending_receiver.h"
 #include "starboard/media.h"
 #include "starboard/player.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
@@ -85,17 +83,8 @@ ::media::SupportedCodecs GetStarboardEmeSupportedCodecs() {
   return codecs;
 }
 
-void BindHostReceiverWithValuation(mojo::GenericPendingReceiver receiver) {
-  content::RenderThread::Get()->BindHostReceiver(std::move(receiver));
-}
-
 }  // namespace
 
-static_assert(std::is_same<::media::BindHostReceiverCallback,
-                           base::RepeatingCallback<
-                               decltype(BindHostReceiverWithValuation)>>::value,
-              "These two types must be the same");
-
 CobaltContentRendererClient::CobaltContentRendererClient() {
   DETACH_FROM_THREAD(thread_checker_);
 }
@@ -221,12 +210,15 @@ void CobaltContentRendererClient::RunScriptsAtDocumentStart(
   communication->RunScriptsAtDocumentStart();
 }
 
+<<<<<<< HEAD
 void CobaltContentRendererClient::BindHostReceiver(
     mojo::GenericPendingReceiver receiver) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   BindHostReceiverWithValuation(std::move(receiver));
 }
 
+=======
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962))
 void CobaltContentRendererClient::GetStarboardRendererFactoryTraits(
     ::media::RendererFactoryTraits* renderer_factory_traits) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
@@ -244,11 +236,6 @@ void CobaltContentRendererClient::GetStarboardRendererFactoryTraits(
   renderer_factory_traits->get_sb_window_handle_callback = base::BindRepeating(
       &CobaltContentRendererClient::GetSbWindowHandle, base::Unretained(this));
 #endif  // BUILDFLAG(IS_STARBOARD)
-  // TODO(b/405424096) - Cobalt: Move VideoGeometrySetterService to Gpu thread.
-  renderer_factory_traits->bind_host_receiver_callback =
-      base::BindPostTaskToCurrentDefault(
-          base::BindRepeating(&CobaltContentRendererClient::BindHostReceiver,
-                              weak_factory_.GetWeakPtr()));
 }
 
 void CobaltContentRendererClient::PostSandboxInitialized() {

cobalt/renderer/cobalt_content_renderer_client.h

@@ -28,10 +28,6 @@ class MediaLog;
 class RendererFactory;
 }  // namespace media
 
-namespace mojo {
-class GenericPendingReceiver;
-}  // namespace mojo
-
 namespace cobalt {
 // This class utilizes embedder API for participating in renderer logic.
 // It allows Cobalt to customize content Renderer module.
@@ -57,11 +53,6 @@ class CobaltContentRendererClient : public content::ContentRendererClient {
       ::media::RendererFactoryTraits* traits) override;
   void PostSandboxInitialized() override;
 
-  // Bind Host Receiver to VideoGeometryChangeSubscriber on Browser thread.
-  // This is called from StarboardRenderer with |BindPostTaskToCurrentDefault|
-  // on media thread to post the task on Renderer thread.
-  void BindHostReceiver(mojo::GenericPendingReceiver receiver);
-
   uint64_t GetSbWindowHandle() const { return sb_window_handle_; }
 
  private:

cobalt/shell/gpu/shell_content_gpu_client.cc

@@ -17,14 +17,32 @@
 
 #include "base/functional/bind.h"
 #include "base/task/single_thread_task_runner.h"
+<<<<<<< HEAD:cobalt/shell/gpu/shell_content_gpu_client.cc
 #if defined(RUN_BROWSER_TESTS)
 #include "cobalt/shell/common/power_monitor_test_impl.h"  // nogncheck
 #endif  // defined(RUN_BROWSER_TESTS)
+=======
+#include "cobalt/media/service/mojom/video_geometry_setter.mojom.h"
+#include "cobalt/media/service/video_geometry_setter_service.h"
+#include "cobalt/testing/browser_tests/common/power_monitor_test_impl.h"
+#include "components/viz/service/display/starboard/video_geometry_setter.h"
+#include "content/public/child/child_thread.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962)):cobalt/testing/browser_tests/gpu/shell_content_gpu_test_client.cc
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 
 namespace content {
 
+<<<<<<< HEAD:cobalt/shell/gpu/shell_content_gpu_client.cc
 ShellContentGpuClient::ShellContentGpuClient() = default;
+=======
+ShellContentGpuTestClient::ShellContentGpuTestClient()
+    : video_geometry_setter_service_(
+          std::unique_ptr<cobalt::media::VideoGeometrySetterService,
+                          base::OnTaskRunnerDeleter>(
+              nullptr,
+              base::OnTaskRunnerDeleter(nullptr))) {}
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962)):cobalt/testing/browser_tests/gpu/shell_content_gpu_test_client.cc
 
 ShellContentGpuClient::~ShellContentGpuClient() = default;
 
@@ -40,4 +58,22 @@ void ShellContentGpuClient::ExposeInterfacesToBrowser(
 #endif  // defined(RUN_BROWSER_TESTS)
 }
 
+cobalt::media::VideoGeometrySetterService*
+ShellContentGpuTestClient::GetVideoGeometrySetterService() {
+  if (!video_geometry_setter_service_) {
+    CreateVideoGeometrySetterService();
+  }
+  return video_geometry_setter_service_.get();
+}
+
+void ShellContentGpuTestClient::CreateVideoGeometrySetterService() {
+  DCHECK(!video_geometry_setter_service_);
+  video_geometry_setter_service_ =
+      std::unique_ptr<cobalt::media::VideoGeometrySetterService,
+                      base::OnTaskRunnerDeleter>(
+          new cobalt::media::VideoGeometrySetterService,
+          base::OnTaskRunnerDeleter(
+              base::SingleThreadTaskRunner::GetCurrentDefault()));
+}
+
 }  // namespace content

cobalt/shell/gpu/shell_content_gpu_client.h

@@ -16,6 +16,7 @@
 #ifndef COBALT_SHELL_GPU_SHELL_CONTENT_GPU_CLIENT_H_
 #define COBALT_SHELL_GPU_SHELL_CONTENT_GPU_CLIENT_H_
 
+#include "cobalt/media/service/video_geometry_setter_service.h"
 #include "content/public/gpu/content_gpu_client.h"
 #include "services/network/public/mojom/network_service_test.mojom-forward.h"
 
@@ -35,6 +36,22 @@ class ShellContentGpuClient : public ContentGpuClient {
       const gpu::GpuPreferences& gpu_preferences,
       const gpu::GpuDriverBugWorkarounds& gpu_workarounds,
       mojo::BinderMap* binders) override;
+<<<<<<< HEAD:cobalt/shell/gpu/shell_content_gpu_client.h
+=======
+
+  void PostCompositorThreadCreated(
+      base::SingleThreadTaskRunner* task_runner) override;
+
+  cobalt::media::VideoGeometrySetterService* GetVideoGeometrySetterService()
+      override;
+
+ private:
+  void CreateVideoGeometrySetterService();
+
+  std::unique_ptr<cobalt::media::VideoGeometrySetterService,
+                  base::OnTaskRunnerDeleter>
+      video_geometry_setter_service_;
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962)):cobalt/testing/browser_tests/gpu/shell_content_gpu_test_client.h
 };
 
 }  // namespace content

cobalt/testing/browser_tests/BUILD.gn

@@ -428,7 +428,13 @@ static_library("cobalt_shell_test_lib") {
 
   public_deps = [
     "//cc/base",
+<<<<<<< HEAD
     "//cobalt/shell:browsertests_mojom",
+=======
+    "//cobalt/media/service",
+    "//cobalt/media/service/mojom",
+    "//cobalt/shell:cobalt_shell_app",
+>>>>>>> d1376b13b0 (cobalt: Move VideoGeometrySetterService on gpu thread (#8962))
     "//cobalt/shell:cobalt_shell_lib",
     "//cobalt/shell:shell_controller_mojom",
     "//components/custom_handlers:test_support",