[//media] Remove GpuVideoAcceleratorFactories::ImageTextureTarget()
After prior refactorings, this method now has no clients.
Bug: 41494843
Change-Id: Ifb8d595db9c13758e054204066db18178ca4e7b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5331879
Reviewed-by: Frank Liberato <liberato@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1267737}
diff --git a/content/browser/media/android/browser_gpu_video_accelerator_factories.cc b/content/browser/media/android/browser_gpu_video_accelerator_factories.cc
index b9ce182..3c6a6a7 100644
--- a/content/browser/media/android/browser_gpu_video_accelerator_factories.cc
+++ b/content/browser/media/android/browser_gpu_video_accelerator_factories.cc
@@ -156,11 +156,6 @@
return false;
}
-unsigned BrowserGpuVideoAcceleratorFactories::ImageTextureTarget(
- gfx::BufferFormat format) {
- return -1;
-}
-
media::GpuVideoAcceleratorFactories::OutputFormat
BrowserGpuVideoAcceleratorFactories::VideoFrameOutputFormat(
media::VideoPixelFormat pixel_format) {
diff --git a/content/browser/media/android/browser_gpu_video_accelerator_factories.h b/content/browser/media/android/browser_gpu_video_accelerator_factories.h
index 6dd7c737..1ed994a 100644
--- a/content/browser/media/android/browser_gpu_video_accelerator_factories.h
+++ b/content/browser/media/android/browser_gpu_video_accelerator_factories.h
@@ -57,7 +57,6 @@
gfx::BufferUsage usage) override;
bool ShouldUseGpuMemoryBuffersForVideoFrames(
bool for_media_stream) const override;
- unsigned ImageTextureTarget(gfx::BufferFormat format) override;
media::GpuVideoAcceleratorFactories::OutputFormat VideoFrameOutputFormat(
media::VideoPixelFormat pixel_format) override;
gpu::SharedImageInterface* SharedImageInterface() override;
diff --git a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
index 00188a8d..5783ed4 100644
--- a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
+++ b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
@@ -288,14 +288,6 @@
: enable_video_gpu_memory_buffers_;
}
-unsigned GpuVideoAcceleratorFactoriesImpl::ImageTextureTarget(
- gfx::BufferFormat format) {
- DCHECK(context_provider_);
- return gpu::GetBufferTextureTarget(gfx::BufferUsage::SCANOUT_CPU_READ_WRITE,
- format,
- context_provider_->ContextCapabilities());
-}
-
media::GpuVideoAcceleratorFactories::OutputFormat
GpuVideoAcceleratorFactoriesImpl::VideoFrameOutputFormat(
media::VideoPixelFormat pixel_format) {
diff --git a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
index ca7e7ed..fbf50f15 100644
--- a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
+++ b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
@@ -108,7 +108,6 @@
bool ShouldUseGpuMemoryBuffersForVideoFrames(
bool for_media_stream) const override;
- unsigned ImageTextureTarget(gfx::BufferFormat format) override;
OutputFormat VideoFrameOutputFormat(
media::VideoPixelFormat pixel_format) override;
diff --git a/media/video/gpu_video_accelerator_factories.h b/media/video/gpu_video_accelerator_factories.h
index 19678e7..a191a9d1 100644
--- a/media/video/gpu_video_accelerator_factories.h
+++ b/media/video/gpu_video_accelerator_factories.h
@@ -176,9 +176,6 @@
virtual bool ShouldUseGpuMemoryBuffersForVideoFrames(
bool for_media_stream) const = 0;
- // The GLContextLock must be taken when calling this.
- virtual unsigned ImageTextureTarget(gfx::BufferFormat format) = 0;
-
// Pixel format of the hardware video frames created when GpuMemoryBuffers
// video frames are enabled.
virtual OutputFormat VideoFrameOutputFormat(
diff --git a/media/video/mock_gpu_video_accelerator_factories.cc b/media/video/mock_gpu_video_accelerator_factories.cc
index 53c48f09..44c80c1 100644
--- a/media/video/mock_gpu_video_accelerator_factories.cc
+++ b/media/video/mock_gpu_video_accelerator_factories.cc
@@ -139,9 +139,4 @@
return false;
}
-unsigned MockGpuVideoAcceleratorFactories::ImageTextureTarget(
- gfx::BufferFormat format) {
- return GL_TEXTURE_2D;
-}
-
} // namespace media
diff --git a/media/video/mock_gpu_video_accelerator_factories.h b/media/video/mock_gpu_video_accelerator_factories.h
index e2136edf..137bfb41 100644
--- a/media/video/mock_gpu_video_accelerator_factories.h
+++ b/media/video/mock_gpu_video_accelerator_factories.h
@@ -69,7 +69,6 @@
bool ShouldUseGpuMemoryBuffersForVideoFrames(
bool for_media_stream) const override;
- unsigned ImageTextureTarget(gfx::BufferFormat format) override;
OutputFormat VideoFrameOutputFormat(VideoPixelFormat pixel_format) override {
return video_frame_output_format_;
}
