Skip to content

GitLab

T
tangled
Commit aba1a495 authored by Antoine Labour's avatar Antoine Labour Committed by Commit Bot
Browse files
Options

Remove unused GpuVideoAcceleratorFactories member functions 

They are unused after GpuVideoDecoder removal.

Bug: 882542
Change-Id: Ic5e64f2b30b8a32be7a4f9209d5aebe007f439f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674474
Auto-Submit: Antoine Labour <piman@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#671873}
parent 0cc4b93b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 174 deletions
content/browser/media/android/browser_gpu_video_accelerator_factories.cc
View file @ aba1a495
......@@ -117,26 +117,6 @@ BrowserGpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator() {
return nullptr;
}
bool BrowserGpuVideoAcceleratorFactories::CreateTextures(
int32_t count,
const gfx::Size& size,
std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
uint32_t texture_target) {
return false;
}
void BrowserGpuVideoAcceleratorFactories::DeleteTexture(uint32_t texture_id) {}
gpu::SyncToken BrowserGpuVideoAcceleratorFactories::CreateSyncToken() {
return gpu::SyncToken();
}
void BrowserGpuVideoAcceleratorFactories::ShallowFlushCHROMIUM() {}
void BrowserGpuVideoAcceleratorFactories::WaitSyncToken(
const gpu::SyncToken& sync_token) {}
void BrowserGpuVideoAcceleratorFactories::SignalSyncToken(
const gpu::SyncToken& sync_token,
base::OnceClosure callback) {}
......@@ -165,10 +145,6 @@ BrowserGpuVideoAcceleratorFactories::VideoFrameOutputFormat(
return GpuVideoAcceleratorFactories::OutputFormat::UNDEFINED;
}
gpu::gles2::GLES2Interface* BrowserGpuVideoAcceleratorFactories::ContextGL() {
return nullptr;
}
gpu::SharedImageInterface*
BrowserGpuVideoAcceleratorFactories::SharedImageInterface() {
NOTREACHED();
......@@ -202,11 +178,6 @@ BrowserGpuVideoAcceleratorFactories::GetMediaContextProvider() {
return context_provider_;
}
gpu::ContextSupport*
BrowserGpuVideoAcceleratorFactories::GetMediaContextProviderContextSupport() {
return GetMediaContextProvider()->ContextSupport();
}
void BrowserGpuVideoAcceleratorFactories::SetRenderingColorSpace(
const gfx::ColorSpace& color_space) {}
......
content/browser/media/android/browser_gpu_video_accelerator_factories.h
View file @ aba1a495
......@@ -33,15 +33,6 @@ class BrowserGpuVideoAcceleratorFactories
const media::RequestOverlayInfoCB& request_overlay_info_cb) override;
std::unique_ptr<media::VideoEncodeAccelerator> CreateVideoEncodeAccelerator()
override;
bool CreateTextures(int32_t count,
const gfx::Size& size,
std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
uint32_t texture_target) override;
void DeleteTexture(uint32_t texture_id) override;
gpu::SyncToken CreateSyncToken() override;
void ShallowFlushCHROMIUM() override;
void WaitSyncToken(const gpu::SyncToken& sync_token) override;
void SignalSyncToken(const gpu::SyncToken& sync_token,
base::OnceClosure callback) override;
std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
......@@ -53,7 +44,6 @@ class BrowserGpuVideoAcceleratorFactories
unsigned ImageTextureTarget(gfx::BufferFormat format) override;
media::GpuVideoAcceleratorFactories::OutputFormat VideoFrameOutputFormat(
media::VideoPixelFormat pixel_format) override;
gpu::gles2::GLES2Interface* ContextGL() override;
gpu::SharedImageInterface* SharedImageInterface() override;
gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() override;
std::unique_ptr<base::SharedMemory> CreateSharedMemory(size_t size) override;
......@@ -62,7 +52,6 @@ class BrowserGpuVideoAcceleratorFactories
GetVideoEncodeAcceleratorSupportedProfiles() override;
scoped_refptr<viz::ContextProviderCommandBuffer> GetMediaContextProvider()
override;
gpu::ContextSupport* GetMediaContextProviderContextSupport() override;
void SetRenderingColorSpace(const gfx::ColorSpace& color_space) override;
scoped_refptr<viz::ContextProviderCommandBuffer> context_provider_;
......
content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
View file @ aba1a495
......@@ -258,76 +258,6 @@ GpuVideoAcceleratorFactoriesImpl::CreateVideoEncodeAccelerator() {
.video_encode_accelerator_supported_profiles));
}
bool GpuVideoAcceleratorFactoriesImpl::CreateTextures(
int32_t count,
const gfx::Size& size,
std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
uint32_t texture_target) {
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(texture_target);
if (CheckContextLost())
return false;
gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
texture_ids->resize(count);
texture_mailboxes->resize(count);
gles2->GenTextures(count, &texture_ids->at(0));
for (int i = 0; i < count; ++i) {
gles2->ActiveTexture(GL_TEXTURE0);
uint32_t texture_id = texture_ids->at(i);
gles2->BindTexture(texture_target, texture_id);
gles2->TexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
gles2->TexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
gles2->TexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
gles2->TexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
if (texture_target == GL_TEXTURE_2D) {
gles2->TexImage2D(texture_target, 0, GL_RGBA, size.width(), size.height(),
0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
}
gles2->ProduceTextureDirectCHROMIUM(texture_id,
texture_mailboxes->at(i).name);
}
// We need ShallowFlushCHROMIUM() here to order the command buffer commands
// with respect to IPC to the GPU process, to guarantee that the decoder in
// the GPU process can use these textures as soon as it receives IPC
// notification of them.
gles2->ShallowFlushCHROMIUM();
DCHECK_EQ(gles2->GetError(), static_cast<GLenum>(GL_NO_ERROR));
return true;
}
void GpuVideoAcceleratorFactoriesImpl::DeleteTexture(uint32_t texture_id) {
DCHECK(task_runner_->BelongsToCurrentThread());
if (CheckContextLost())
return;
gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
gles2->DeleteTextures(1, &texture_id);
DCHECK_EQ(gles2->GetError(), static_cast<GLenum>(GL_NO_ERROR));
}
gpu::SyncToken GpuVideoAcceleratorFactoriesImpl::CreateSyncToken() {
gpu::SyncToken sync_token;
context_provider_->ContextGL()->GenSyncTokenCHROMIUM(sync_token.GetData());
return sync_token;
}
void GpuVideoAcceleratorFactoriesImpl::WaitSyncToken(
const gpu::SyncToken& sync_token) {
DCHECK(task_runner_->BelongsToCurrentThread());
if (CheckContextLost())
return;
gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
gles2->WaitSyncTokenCHROMIUM(sync_token.GetConstData());
// Callers expect the WaitSyncToken to affect the next IPCs. Make sure to
// flush the command buffers to ensure that.
gles2->ShallowFlushCHROMIUM();
}
void GpuVideoAcceleratorFactoriesImpl::SignalSyncToken(
const gpu::SyncToken& sync_token,
base::OnceClosure callback) {
......@@ -339,14 +269,6 @@ void GpuVideoAcceleratorFactoriesImpl::SignalSyncToken(
std::move(callback));
}
void GpuVideoAcceleratorFactoriesImpl::ShallowFlushCHROMIUM() {
DCHECK(task_runner_->BelongsToCurrentThread());
if (CheckContextLost())
return;
context_provider_->ContextGL()->ShallowFlushCHROMIUM();
}
std::unique_ptr<gfx::GpuMemoryBuffer>
GpuVideoAcceleratorFactoriesImpl::CreateGpuMemoryBuffer(
const gfx::Size& size,
......@@ -431,10 +353,6 @@ GpuVideoAcceleratorFactoriesImpl::VideoFrameOutputFormat(
return media::GpuVideoAcceleratorFactories::OutputFormat::UNDEFINED;
}
gpu::gles2::GLES2Interface* GpuVideoAcceleratorFactoriesImpl::ContextGL() {
return CheckContextLost() ? nullptr : context_provider_->ContextGL();
}
gpu::SharedImageInterface*
GpuVideoAcceleratorFactoriesImpl::SharedImageInterface() {
return CheckContextLost() ? nullptr
......@@ -472,12 +390,6 @@ GpuVideoAcceleratorFactoriesImpl::GetMediaContextProvider() {
return CheckContextLost() ? nullptr : context_provider_;
}
gpu::ContextSupport*
GpuVideoAcceleratorFactoriesImpl::GetMediaContextProviderContextSupport() {
auto context_provider = GetMediaContextProvider();
return context_provider ? context_provider->ContextSupport() : nullptr;
}
void GpuVideoAcceleratorFactoriesImpl::SetRenderingColorSpace(
const gfx::ColorSpace& color_space) {
rendering_color_space_ = color_space;
......
content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
View file @ aba1a495
......@@ -79,19 +79,8 @@ class CONTENT_EXPORT GpuVideoAcceleratorFactoriesImpl
const media::VideoDecoderConfig& config) override;
std::unique_ptr<media::VideoEncodeAccelerator> CreateVideoEncodeAccelerator()
override;
// Creates textures and produces them into mailboxes. Returns true on success
// or false on failure.
bool CreateTextures(int32_t count,
const gfx::Size& size,
std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
uint32_t texture_target) override;
void DeleteTexture(uint32_t texture_id) override;
gpu::SyncToken CreateSyncToken() override;
void WaitSyncToken(const gpu::SyncToken& sync_token) override;
void SignalSyncToken(const gpu::SyncToken& sync_token,
base::OnceClosure callback) override;
void ShallowFlushCHROMIUM() override;
std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
const gfx::Size& size,
......@@ -104,9 +93,6 @@ class CONTENT_EXPORT GpuVideoAcceleratorFactoriesImpl
OutputFormat VideoFrameOutputFormat(
media::VideoPixelFormat pixel_format) override;
// Called on the media thread. Returns the GLES2Interface unless the
// ContextProvider has been lost, in which case it returns null.
gpu::gles2::GLES2Interface* ContextGL() override;
// Called on the media thread. Returns the SharedImageInterface unless the
// ContextProvider has been lost, in which case it returns null.
gpu::SharedImageInterface* SharedImageInterface() override;
......@@ -128,7 +114,6 @@ class CONTENT_EXPORT GpuVideoAcceleratorFactoriesImpl
scoped_refptr<viz::ContextProviderCommandBuffer> GetMediaContextProvider()
override;
gpu::ContextSupport* GetMediaContextProviderContextSupport() override;
void SetRenderingColorSpace(const gfx::ColorSpace& color_space) override;
......
media/video/gpu_video_accelerator_factories.h
View file @ aba1a495
......@@ -35,7 +35,6 @@ class Size;
}
namespace gpu {
class ContextSupport;
class GpuMemoryBufferManager;
class SharedImageInterface;
struct SyncToken;
......@@ -99,17 +98,6 @@ class MEDIA_EXPORT GpuVideoAcceleratorFactories {
virtual std::unique_ptr<VideoEncodeAccelerator>
CreateVideoEncodeAccelerator() = 0;
// Allocate & delete native textures.
virtual bool CreateTextures(int32_t count,
const gfx::Size& size,
std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
uint32_t texture_target) = 0;
virtual void DeleteTexture(uint32_t texture_id) = 0;
virtual gpu::SyncToken CreateSyncToken() = 0;
virtual void ShallowFlushCHROMIUM() = 0;
virtual void WaitSyncToken(const gpu::SyncToken& sync_token) = 0;
virtual void SignalSyncToken(const gpu::SyncToken& sync_token,
base::OnceClosure callback) = 0;
......@@ -130,12 +118,6 @@ class MEDIA_EXPORT GpuVideoAcceleratorFactories {
virtual OutputFormat VideoFrameOutputFormat(
VideoPixelFormat pixel_format) = 0;
// Returns a GL Context that can be used on the task runner associated with
// the same instance of GpuVideoAcceleratorFactories.
// nullptr will be returned in cases where a context couldn't be created or
// the context was lost.
virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
// Returns a SharedImageInterface that can be used (on any thread) to allocate
// and update shared images.
// nullptr will be returned in cases where a context couldn't be created or
......@@ -160,7 +142,6 @@ class MEDIA_EXPORT GpuVideoAcceleratorFactories {
virtual scoped_refptr<viz::ContextProviderCommandBuffer>
GetMediaContextProvider() = 0;
virtual gpu::ContextSupport* GetMediaContextProviderContextSupport() = 0;
// Sets the current pipeline rendering color space.
virtual void SetRenderingColorSpace(const gfx::ColorSpace& color_space) = 0;
......
media/video/mock_gpu_video_accelerator_factories.h
View file @ aba1a495
......@@ -47,25 +47,14 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
// framework does not want. Trampoline it.
MOCK_METHOD0(DoCreateVideoEncodeAccelerator, VideoEncodeAccelerator*());
MOCK_METHOD5(CreateTextures,
bool(int32_t count,
const gfx::Size& size,
std::vector<uint32_t>* texture_ids,
std::vector<gpu::Mailbox>* texture_mailboxes,
uint32_t texture_target));
MOCK_METHOD1(DeleteTexture, void(uint32_t texture_id));
MOCK_METHOD0(CreateSyncToken, gpu::SyncToken());
MOCK_METHOD1(WaitSyncToken, void(const gpu::SyncToken& sync_token));
MOCK_METHOD2(SignalSyncToken,
void(const gpu::SyncToken& sync_token,
base::OnceClosure callback));
MOCK_METHOD0(ShallowFlushCHROMIUM, void());
MOCK_METHOD0(GetTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());
MOCK_METHOD0(GetVideoEncodeAcceleratorSupportedProfiles,
VideoEncodeAccelerator::SupportedProfiles());
MOCK_METHOD0(GetMediaContextProvider,
scoped_refptr<viz::ContextProviderCommandBuffer>());
MOCK_METHOD0(GetMediaContextProviderContextSupport, gpu::ContextSupport*());
MOCK_METHOD1(SetRenderingColorSpace, void(const gfx::ColorSpace&));
std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
......@@ -80,7 +69,6 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
return video_frame_output_format_;
}
gpu::gles2::GLES2Interface* ContextGL() override { return nullptr; }
gpu::SharedImageInterface* SharedImageInterface() override { return sii_; }
gpu::GpuMemoryBufferManager* GpuMemoryBufferManager() override {
return nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment