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 6ac947a3251adf059536f85b88c9b2a33c67ae07..4f42dcb0c864d4c7179b3e510ac7c51463e6d275 100644 |
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc |
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc |
@@ -30,12 +30,12 @@ RendererGpuVideoAcceleratorFactories::Create( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
unsigned image_texture_target, |
+ media::VideoPixelFormat video_frame_pixel_format, |
bool enable_video_accelerator) { |
scoped_refptr<RendererGpuVideoAcceleratorFactories> factories = |
- new RendererGpuVideoAcceleratorFactories(gpu_channel_host, task_runner, |
- context_provider, |
- image_texture_target, |
- enable_video_accelerator); |
+ new RendererGpuVideoAcceleratorFactories( |
+ gpu_channel_host, task_runner, context_provider, image_texture_target, |
+ video_frame_pixel_format, enable_video_accelerator); |
// Post task from outside constructor, since AddRef()/Release() is unsafe from |
// within. |
task_runner->PostTask( |
@@ -50,14 +50,16 @@ RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
unsigned image_texture_target, |
+ media::VideoPixelFormat video_frame_pixel_format, |
bool enable_video_accelerator) |
: task_runner_(task_runner), |
gpu_channel_host_(gpu_channel_host), |
context_provider_(context_provider), |
image_texture_target_(image_texture_target), |
+ video_frame_pixel_format_(video_frame_pixel_format), |
video_accelerator_enabled_(enable_video_accelerator), |
- gpu_memory_buffer_manager_( |
- ChildThreadImpl::current()->gpu_memory_buffer_manager()), |
+ gpu_memory_buffer_manager_(ChildThreadImpl::current() |
+ ->gpu_memory_buffer_manager()), |
thread_safe_sender_(ChildThreadImpl::current()->thread_safe_sender()) { |
DCHECK(gpu_channel_host_.get()); |
} |
@@ -226,6 +228,11 @@ unsigned RendererGpuVideoAcceleratorFactories::ImageTextureTarget() { |
return image_texture_target_; |
} |
+media::VideoPixelFormat |
+RendererGpuVideoAcceleratorFactories::VideoFramePixelFormat() { |
+ return video_frame_pixel_format_; |
+} |
+ |
gpu::gles2::GLES2Interface* |
RendererGpuVideoAcceleratorFactories::GetGLES2Interface() { |
DCHECK(task_runner_->BelongsToCurrentThread()); |