Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(876)

Unified Diff: content/renderer/media/renderer_gpu_video_accelerator_factories.cc

Issue 2656183002: Change effect of flag kDisableAcceleratedVideoDecode to only affect decode
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/renderer_gpu_video_accelerator_factories.cc
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
index 9ba79d4aa0e5a095c48cca0e87caced04f0330e0..ec6ef514f940eb23da40babe61c3f824d006c1ac 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
@@ -52,13 +52,13 @@ RendererGpuVideoAcceleratorFactories::Create(
const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
const cc::BufferToTextureTargetMap& image_texture_targets,
- bool enable_video_accelerator) {
+ bool enable_video_decode_accelerator) {
RecordContextProviderPhaseUmaEnum(
ContextProviderPhase::CONTEXT_PROVIDER_ACQUIRED);
return base::WrapUnique(new RendererGpuVideoAcceleratorFactories(
std::move(gpu_channel_host), main_thread_task_runner, task_runner,
context_provider, enable_gpu_memory_buffer_video_frames,
- image_texture_targets, enable_video_accelerator));
+ image_texture_targets, enable_video_decode_accelerator));
}
RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories(
@@ -68,7 +68,7 @@ RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories(
const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
const cc::BufferToTextureTargetMap& image_texture_targets,
- bool enable_video_accelerator)
+ bool enable_video_decode_accelerator)
: main_thread_task_runner_(main_thread_task_runner),
task_runner_(task_runner),
gpu_channel_host_(std::move(gpu_channel_host)),
@@ -77,7 +77,7 @@ RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories(
enable_gpu_memory_buffer_video_frames_(
enable_gpu_memory_buffer_video_frames),
image_texture_targets_(image_texture_targets),
- video_accelerator_enabled_(enable_video_accelerator),
+ video_decode_accelerator_enabled_(enable_video_decode_accelerator),
gpu_memory_buffer_manager_(
RenderThreadImpl::current()->GetGpuMemoryBufferManager()),
thread_safe_sender_(ChildThreadImpl::current()->thread_safe_sender()) {
@@ -110,8 +110,9 @@ bool RendererGpuVideoAcceleratorFactories::CheckContextLost() {
return !context_provider_;
}
-bool RendererGpuVideoAcceleratorFactories::IsGpuVideoAcceleratorEnabled() {
- return video_accelerator_enabled_;
+bool RendererGpuVideoAcceleratorFactories::
+ IsGpuVideoDecodeAcceleratorEnabled() {
+ return video_decode_accelerator_enabled_;
}
base::UnguessableToken RendererGpuVideoAcceleratorFactories::GetChannelToken() {
@@ -136,7 +137,7 @@ int32_t RendererGpuVideoAcceleratorFactories::GetCommandBufferRouteId() {
std::unique_ptr<media::VideoDecodeAccelerator>
RendererGpuVideoAcceleratorFactories::CreateVideoDecodeAccelerator() {
- DCHECK(video_accelerator_enabled_);
+ DCHECK(video_decode_accelerator_enabled_);
DCHECK(task_runner_->BelongsToCurrentThread());
if (CheckContextLost())
return nullptr;
@@ -148,7 +149,6 @@ RendererGpuVideoAcceleratorFactories::CreateVideoDecodeAccelerator() {
std::unique_ptr<media::VideoEncodeAccelerator>
RendererGpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator() {
- DCHECK(video_accelerator_enabled_);
DCHECK(task_runner_->BelongsToCurrentThread());
if (CheckContextLost())
return nullptr;
« no previous file with comments | « content/renderer/media/renderer_gpu_video_accelerator_factories.h ('k') | content/renderer/media/video_track_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698