Index: content/common/gpu/media/gpu_video_decode_accelerator.cc |
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
index 1680c9c31217738394dfd1f1f8eb0b710902724c..3c630165bf414756ab1fe5a3c66c1de757441931 100644 |
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
@@ -28,10 +28,12 @@ |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) |
#include "content/common/gpu/media/v4l2_video_decode_accelerator.h" |
#include "content/common/gpu/media/v4l2_video_device.h" |
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
+#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" |
+#if defined(USE_X11) |
#include "ui/gl/gl_context_glx.h" |
#include "ui/gl/gl_implementation.h" |
+#endif |
#elif defined(OS_ANDROID) |
#include "content/common/gpu/media/android_video_decode_accelerator.h" |
#endif |
@@ -264,7 +266,8 @@ void GpuVideoDecodeAccelerator::Initialize( |
make_context_current_, |
device.Pass(), |
io_message_loop_)); |
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
+#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
+#if defined(USE_X11) |
if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) { |
VLOG(1) << "HW video decode acceleration not available without " |
"DesktopGL (GLX)."; |
@@ -275,6 +278,10 @@ void GpuVideoDecodeAccelerator::Initialize( |
static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext()); |
video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator( |
glx_context->display(), make_context_current_)); |
+#elif defined(USE_OZONE) |
+ video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator( |
+ make_context_current_)); |
+#endif |
#elif defined(OS_ANDROID) |
video_decode_accelerator_.reset(new AndroidVideoDecodeAccelerator( |
stub_->decoder()->AsWeakPtr(), |