Chromium Code Reviews| 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 23fd238736df450fdf6bbc98e6b7e65c305a5d0a..5d4b50201abb4206b2d68f37394479a215d4ce4d 100644 |
| --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc |
| +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc |
| @@ -12,8 +12,8 @@ |
| #include "content/common/gpu/client/context_provider_command_buffer.h" |
| #include "content/common/gpu/client/gl_helper.h" |
| #include "content/common/gpu/client/gpu_channel_host.h" |
| -#include "content/common/gpu/client/gpu_video_encode_accelerator_host.h" |
| #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
| +#include "content/common/gpu/media/gpu_video_accelerator_util.h" |
| #include "content/renderer/render_thread_impl.h" |
| #include "gpu/command_buffer/client/gles2_implementation.h" |
| #include "media/video/video_decode_accelerator.h" |
| @@ -200,12 +200,23 @@ RendererGpuVideoAcceleratorFactories::GetTaskRunner() { |
| return task_runner_; |
| } |
| -std::vector<media::VideoEncodeAccelerator::SupportedProfile> |
| -RendererGpuVideoAcceleratorFactories:: |
| - GetVideoEncodeAcceleratorSupportedProfiles() { |
| - return GpuVideoEncodeAcceleratorHost::ConvertGpuToMediaProfiles( |
| - gpu_channel_host_->gpu_info() |
| - .video_encode_accelerator_supported_profiles); |
| +bool RendererGpuVideoAcceleratorFactories:: |
| + GetVideoDecodeAcceleratorSupportedProfiles(std::vector< |
| + media::VideoDecodeAccelerator::SupportedProfile>* supported_profiles) { |
| + *supported_profiles = |
|
wuchengli
2015/03/19 06:19:25
Prefer not to touch |support_profiles| if support_
henryhsu
2015/03/19 10:00:32
Done.
|
| + GpuVideoAcceleratorUtil::ConvertGpuToMediaDecodeProfiles( |
| + gpu_channel_host_->gpu_info() |
| + .video_decode_accelerator_supported_profiles); |
| + return gpu_channel_host_->gpu_info().support_query_video_decode_profiles; |
| +} |
| + |
| +void RendererGpuVideoAcceleratorFactories:: |
| + GetVideoEncodeAcceleratorSupportedProfiles(std::vector< |
| + media::VideoEncodeAccelerator::SupportedProfile>* supported_profiles) { |
| + *supported_profiles = |
| + GpuVideoAcceleratorUtil::ConvertGpuToMediaEncodeProfiles( |
| + gpu_channel_host_->gpu_info() |
| + .video_encode_accelerator_supported_profiles); |
| } |
| } // namespace content |