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

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

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.h
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
index 378d01b05e127f0d665ceab1dcef6e3e9f54587e..b98af023c44d48cbd08c4e46478c4f3c68ffffae 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
@@ -15,6 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/waitable_event.h"
+#include "cc/output/buffer_to_texture_target_map.h"
#include "content/child/thread_safe_sender.h"
#include "content/common/content_export.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
@@ -52,7 +53,7 @@ class CONTENT_EXPORT 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);
// media::GpuVideoAcceleratorFactories implementation.
@@ -103,7 +104,7 @@ class CONTENT_EXPORT 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);
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
@@ -119,7 +120,7 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
// Whether gpu memory buffers should be used to hold video frames data.
bool enable_gpu_memory_buffer_video_frames_;
- const std::vector<unsigned> image_texture_targets_;
+ const cc::BufferToTextureTargetMap image_texture_targets_;
// Whether video acceleration encoding/decoding should be enabled.
const bool video_accelerator_enabled_;
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/renderer/media/renderer_gpu_video_accelerator_factories.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698