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 b5522b0b97ac1b2e9c01798cca753240d6947a4f..ff0be6ac112a8118b4ae57b972f490f36fdde520 100644 |
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc |
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc |
@@ -31,12 +31,13 @@ RendererGpuVideoAcceleratorFactories::Create( |
const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
bool enable_gpu_memory_buffer_video_frames, |
unsigned image_texture_target, |
+ media::VideoPixelFormat video_frame_output_format, |
bool enable_video_accelerator) { |
scoped_refptr<RendererGpuVideoAcceleratorFactories> factories = |
new RendererGpuVideoAcceleratorFactories( |
gpu_channel_host, task_runner, context_provider, |
enable_gpu_memory_buffer_video_frames, image_texture_target, |
- enable_video_accelerator); |
+ video_frame_output_format, enable_video_accelerator); |
// Post task from outside constructor, since AddRef()/Release() is unsafe from |
// within. |
task_runner->PostTask( |
@@ -52,6 +53,7 @@ RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories( |
const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
bool enable_gpu_memory_buffer_video_frames, |
unsigned image_texture_target, |
+ media::VideoPixelFormat video_frame_output_format, |
bool enable_video_accelerator) |
: task_runner_(task_runner), |
gpu_channel_host_(gpu_channel_host), |
@@ -59,6 +61,7 @@ RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories( |
enable_gpu_memory_buffer_video_frames_( |
enable_gpu_memory_buffer_video_frames), |
image_texture_target_(image_texture_target), |
+ video_frame_output_format_(video_frame_output_format), |
video_accelerator_enabled_(enable_video_accelerator), |
gpu_memory_buffer_manager_(ChildThreadImpl::current() |
->gpu_memory_buffer_manager()), |
@@ -235,6 +238,11 @@ unsigned RendererGpuVideoAcceleratorFactories::ImageTextureTarget() { |
return image_texture_target_; |
} |
+media::VideoPixelFormat |
+RendererGpuVideoAcceleratorFactories::VideoFrameOutputFormat() { |
+ return video_frame_output_format_; |
+} |
+ |
gpu::gles2::GLES2Interface* |
RendererGpuVideoAcceleratorFactories::GetGLES2Interface() { |
DCHECK(task_runner_->BelongsToCurrentThread()); |