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..d52b9540ccf025b5a49e39e94eefdcbe3991919a 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,25 @@ 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) { |
+ if (gpu_channel_host_->gpu_info().support_query_video_decode_profiles) { |
+ *supported_profiles = |
+ 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 |