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

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

Issue 2120713002: Fix use_image_texture_target inconsistencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix content browsertests Created 4 years, 5 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 a22711f0ce612d59b20f6ef2a4b2a30c73a35f9c..3925929c42f35ffd8ab07bb1dc9907ded7a9f8c4 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
@@ -50,7 +50,7 @@ RendererGpuVideoAcceleratorFactories::Create(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
- std::vector<unsigned> image_texture_targets,
+ const cc::BufferToTextureTargetMap& image_texture_targets,
bool enable_video_accelerator) {
RecordContextProviderPhaseUmaEnum(
ContextProviderPhase::CONTEXT_PROVIDER_ACQUIRED);
@@ -66,7 +66,7 @@ RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
- std::vector<unsigned> image_texture_targets,
+ const cc::BufferToTextureTargetMap& image_texture_targets,
bool enable_video_accelerator)
: main_thread_task_runner_(main_thread_task_runner),
task_runner_(task_runner),
@@ -229,7 +229,10 @@ bool RendererGpuVideoAcceleratorFactories::
unsigned RendererGpuVideoAcceleratorFactories::ImageTextureTarget(
gfx::BufferFormat format) {
- return image_texture_targets_[static_cast<int>(format)];
+ auto found = image_texture_targets_.find(cc::BufferToTextureTargetKey(
+ gfx::BufferUsage::GPU_READ_CPU_READ_WRITE, format));
+ DCHECK(found != image_texture_targets_.end());
+ return found->second;
}
media::VideoPixelFormat
« no previous file with comments | « content/renderer/media/renderer_gpu_video_accelerator_factories.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698