[MappableSI] Remove GMBManager from GpuVideoFrameAcceleratorFactories.

Remove GMBManager and all related usages from
GpuVideoFrameAcceleratorFactories since all the clients using it have
been converted to use MappableSI.

This is a functional no-op CL.

Bug: 40263579
Change-Id: I8b5969da374f58396eca065832197261c45979a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6227359
Reviewed-by: Stefan Zager <szager@chromium.org>
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@chromium.org>
Commit-Queue: vikas soni <vikassoni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1417548}

components/mirroring/service/mirroring_gpu_factories_factory.cc

@@ -85,7 +85,6 @@ MirroringGpuFactoriesFactory::GetInstance() {
       cast_environment_->GetTaskRunner(CastEnvironment::ThreadId::kMain),
       cast_environment_->GetTaskRunner(CastEnvironment::ThreadId::kVideo),
       context_provider_, std::move(codec_factory),
-      gpu_->gpu_memory_buffer_manager(),
       /*enable_video_gpu_memory_buffers=*/true,
       /*enable_media_stream_gpu_memory_buffers=*/false,
       /*enable_video_decode_accelerator=*/false,

content/browser/media/android/browser_gpu_video_accelerator_factories.cc

@@ -158,11 +158,6 @@ BrowserGpuVideoAcceleratorFactories::SharedImageInterface() {
   NOTREACHED();
 }
 
-gpu::GpuMemoryBufferManager*
-BrowserGpuVideoAcceleratorFactories::GpuMemoryBufferManager() {
-  NOTREACHED();
-}
-
 base::UnsafeSharedMemoryRegion
 BrowserGpuVideoAcceleratorFactories::CreateSharedMemoryRegion(size_t size) {
   return {};

content/browser/media/android/browser_gpu_video_accelerator_factories.h

@@ -58,7 +58,6 @@ class BrowserGpuVideoAcceleratorFactories
   media::GpuVideoAcceleratorFactories::OutputFormat VideoFrameOutputFormat(
       media::VideoPixelFormat pixel_format) override;
   gpu::SharedImageInterface* SharedImageInterface() override;
-  gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() override;
   base::UnsafeSharedMemoryRegion CreateSharedMemoryRegion(size_t size) override;
   scoped_refptr<base::SequencedTaskRunner> GetTaskRunner() override;
   viz::RasterContextProvider* GetMediaContextProvider() override;

content/renderer/render_thread_impl.cc

@@ -1090,9 +1090,9 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
       std::move(gpu_channel_host),
       base::SingleThreadTaskRunner::GetCurrentDefault(),
       GetMediaSequencedTaskRunner(), std::move(media_context_provider),
-      std::move(codec_factory), GetGpuMemoryBufferManager(),
-      enable_video_gpu_memory_buffers, enable_media_stream_gpu_memory_buffers,
-      enable_video_decode_accelerator, enable_video_encode_accelerator));
+      std::move(codec_factory), enable_video_gpu_memory_buffers,
+      enable_media_stream_gpu_memory_buffers, enable_video_decode_accelerator,
+      enable_video_encode_accelerator));
 
   gpu_factories_.back()->SetRenderingColorSpace(rendering_color_space_);
   return gpu_factories_.back().get();

media/mojo/clients/mojo_gpu_video_accelerator_factories.cc

@@ -18,7 +18,6 @@
 #include "base/task/sequenced_task_runner.h"
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "media/base/decoder.h"
@@ -54,7 +53,6 @@ MojoGpuVideoAcceleratorFactories::Create(
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     const scoped_refptr<viz::ContextProviderCommandBuffer>& context_provider,
     std::unique_ptr<MojoCodecFactory> codec_factory,
-    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool enable_video_gpu_memory_buffers,
     bool enable_media_stream_gpu_memory_buffers,
     bool enable_video_decode_accelerator,
@@ -62,9 +60,8 @@ MojoGpuVideoAcceleratorFactories::Create(
   return base::WrapUnique(new MojoGpuVideoAcceleratorFactories(
       std::move(gpu_channel_host), main_thread_task_runner, task_runner,
       std::move(context_provider), std::move(codec_factory),
-      std::move(gpu_memory_buffer_manager), enable_video_gpu_memory_buffers,
-      enable_media_stream_gpu_memory_buffers, enable_video_decode_accelerator,
-      enable_video_encode_accelerator));
+      enable_video_gpu_memory_buffers, enable_media_stream_gpu_memory_buffers,
+      enable_video_decode_accelerator, enable_video_encode_accelerator));
 }
 
 MojoGpuVideoAcceleratorFactories::MojoGpuVideoAcceleratorFactories(
@@ -73,7 +70,6 @@ MojoGpuVideoAcceleratorFactories::MojoGpuVideoAcceleratorFactories(
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     const scoped_refptr<viz::ContextProviderCommandBuffer>& context_provider,
     std::unique_ptr<MojoCodecFactory> codec_factory,
-    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool enable_video_gpu_memory_buffers,
     bool enable_media_stream_gpu_memory_buffers,
     bool enable_video_decode_accelerator,
@@ -87,8 +83,7 @@ MojoGpuVideoAcceleratorFactories::MojoGpuVideoAcceleratorFactories(
       enable_media_stream_gpu_memory_buffers_(
           enable_media_stream_gpu_memory_buffers),
       video_decode_accelerator_enabled_(enable_video_decode_accelerator),
-      video_encode_accelerator_enabled_(enable_video_encode_accelerator),
-      gpu_memory_buffer_manager_(gpu_memory_buffer_manager) {
+      video_encode_accelerator_enabled_(enable_video_encode_accelerator) {
   DCHECK(main_thread_task_runner_);
   DCHECK(gpu_channel_host_);
 
@@ -370,11 +365,6 @@ MojoGpuVideoAcceleratorFactories::SharedImageInterface() {
                             : context_provider_->SharedImageInterface();
 }
 
-gpu::GpuMemoryBufferManager*
-MojoGpuVideoAcceleratorFactories::GpuMemoryBufferManager() {
-  return gpu_memory_buffer_manager_;
-}
-
 base::UnsafeSharedMemoryRegion
 MojoGpuVideoAcceleratorFactories::CreateSharedMemoryRegion(size_t size) {
   // If necessary, this call will make a synchronous request to a privileged

media/mojo/clients/mojo_gpu_video_accelerator_factories.h

@@ -28,7 +28,6 @@ class SequencedTaskRunner;
 
 namespace gpu {
 class GpuChannelHost;
-class GpuMemoryBufferManager;
 }  // namespace gpu
 
 namespace viz {
@@ -58,7 +57,6 @@ class MojoGpuVideoAcceleratorFactories
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       const scoped_refptr<viz::ContextProviderCommandBuffer>& context_provider,
       std::unique_ptr<MojoCodecFactory> codec_factory,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       bool enable_video_gpu_memory_buffers,
       bool enable_media_stream_gpu_memory_buffers,
       bool enable_video_decode_accelerator,
@@ -95,7 +93,6 @@ class MojoGpuVideoAcceleratorFactories
   // Called on the media thread. Returns the SharedImageInterface unless the
   // ContextProvider has been lost, in which case it returns null.
   gpu::SharedImageInterface* SharedImageInterface() override;
-  gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() override;
   // Called on the media thread. Verifies if the ContextProvider is lost and
   // notifies the main thread of loss if it has occured, which can be seen later
   // from CheckContextProviderLost().
@@ -134,7 +131,6 @@ class MojoGpuVideoAcceleratorFactories
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       const scoped_refptr<viz::ContextProviderCommandBuffer>& context_provider,
       std::unique_ptr<MojoCodecFactory> codec_factory,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       bool enable_gpu_memory_buffer_video_frames_for_video,
       bool enable_gpu_memory_buffer_video_frames_for_media_stream,
       bool enable_video_decode_accelerator,
@@ -180,7 +176,6 @@ class MojoGpuVideoAcceleratorFactories
 
   gfx::ColorSpace rendering_color_space_;
 
-  const raw_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
 };
 
 }  // namespace media

media/mojo/clients/mojo_gpu_video_accelerator_factories_unittest.cc

@@ -18,7 +18,6 @@
 #include "components/viz/common/gpu/context_cache_controller.h"
 #include "components/viz/common/gpu/context_lost_observer.h"
 #include "gpu/command_buffer/client/gles2_interface_stub.h"
-#include "gpu/command_buffer/client/test_gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/command_buffer/common/context_creation_attribs.h"
 #include "gpu/command_buffer/common/context_result.h"
@@ -508,8 +507,7 @@ class MojoGpuVideoAcceleratorFactoriesTest : public testing::Test {
     auto gpu_factories = MojoGpuVideoAcceleratorFactories::Create(
         gpu_channel_host_, task_environment_.GetMainThreadTaskRunner(),
         task_environment_.GetMainThreadTaskRunner(), mock_context_provider_,
-        std::move(codec_factory), &gpu_memory_buffer_manager_,
-        true, /* enable_video_gpu_memory_buffers */
+        std::move(codec_factory), true, /* enable_video_gpu_memory_buffers */
         true, /* enable_media_stream_gpu_memory_buffers */
         enable_video_decode_accelerator, enable_video_encode_accelerator);
 
@@ -533,7 +531,6 @@ class MojoGpuVideoAcceleratorFactoriesTest : public testing::Test {
 
   NiceMock<gpu::MockGpuChannel> mock_gpu_channel_;
   NiceMock<MockGLESInterface> mock_context_gl_;
-  gpu::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   scoped_refptr<TestGpuChannelHost> gpu_channel_host_;
   scoped_refptr<MockContextProviderCommandBuffer> mock_context_provider_;
   std::unique_ptr<gpu::CommandBufferProxyImpl> gpu_command_buffer_proxy_;

media/video/gpu_video_accelerator_factories.h

@@ -35,7 +35,6 @@ class ColorSpace;
 }  // namespace gfx
 
 namespace gpu {
-class GpuMemoryBufferManager;
 class SharedImageInterface;
 }  // namespace gpu
 
@@ -193,11 +192,6 @@ class MEDIA_EXPORT GpuVideoAcceleratorFactories {
   // the context was lost.
   virtual gpu::SharedImageInterface* SharedImageInterface() = 0;
 
-  // Returns the GpuMemoryBufferManager that is used to allocate
-  // GpuMemoryBuffers. May return null if
-  // ShouldUseGpuMemoryBuffersForVideoFrames return false.
-  virtual gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() = 0;
-
   // Allocate & return an unsafe shared memory region
   virtual base::UnsafeSharedMemoryRegion CreateSharedMemoryRegion(
       size_t size) = 0;

media/video/mock_gpu_video_accelerator_factories.h

@@ -71,9 +71,6 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
   }
 
   gpu::SharedImageInterface* SharedImageInterface() override { return sii_; }
-  gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() override {
-    return nullptr;
-  }
 
   void SetVideoFrameOutputFormat(const OutputFormat video_frame_output_format) {
     video_frame_output_format_ = video_frame_output_format;

third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.cc

@@ -105,12 +105,6 @@ class Context : public media::RenderableGpuMemoryBufferVideoFramePool::Context {
     return raster_context_provider_->SharedImageInterface();
   }
 
-  gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() const {
-    auto* manager = gpu_factories_->GpuMemoryBufferManager();
-    DCHECK(manager);
-    return manager;
-  }
-
   raw_ptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
   scoped_refptr<viz::RasterContextProvider> raster_context_provider_;
 };