diff options
Diffstat (limited to 'content/common/gpu/media/gpu_video_encode_accelerator.cc')
| -rw-r--r-- | content/common/gpu/media/gpu_video_encode_accelerator.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc index 639d1d8..12b473f 100644 --- a/content/common/gpu/media/gpu_video_encode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc @@ -17,12 +17,13 @@ #include "media/base/limits.h" #include "media/base/video_frame.h" -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) && defined(USE_X11) -#if defined(ARCH_CPU_ARMEL) && defined(USE_X11) +#if defined(ARCH_CPU_ARMEL) #include "content/common/gpu/media/v4l2_video_encode_accelerator.h" #elif defined(ARCH_CPU_X86_FAMILY) #include "content/common/gpu/media/vaapi_video_encode_accelerator.h" +#include "ui/gfx/x/x11_types.h" #endif #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC) @@ -190,15 +191,15 @@ GpuVideoEncodeAccelerator::ConvertMediaToGpuProfiles(const std::vector< scoped_ptr<media::VideoEncodeAccelerator> GpuVideoEncodeAccelerator::CreateEncoder() { scoped_ptr<media::VideoEncodeAccelerator> encoder; -#if defined(OS_CHROMEOS) -#if defined(ARCH_CPU_ARMEL) && defined(USE_X11) +#if defined(OS_CHROMEOS) && defined(USE_X11) +#if defined(ARCH_CPU_ARMEL) scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder); if (device) encoder.reset(new V4L2VideoEncodeAccelerator(device.Pass())); #elif defined(ARCH_CPU_X86_FAMILY) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (!cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode)) - encoder.reset(new VaapiVideoEncodeAccelerator()); + encoder.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay())); #endif #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC) encoder.reset(new AndroidVideoEncodeAccelerator()); |