| Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| index 34df90cf9e450889edf4f38635eeba4310267e0a..78f53fc5b7c2d2189582a28c9305247e148c5d83 100644
|
| --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| @@ -59,6 +59,9 @@
|
| #elif defined(ARCH_CPU_X86_FAMILY)
|
| #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
|
| #include "content/common/gpu/media/vaapi_wrapper.h"
|
| +#if defined(USE_X11)
|
| +#include "ui/gl/gl_implementation.h"
|
| +#endif // USE_X11
|
| #endif // ARCH_CPU_ARMEL
|
| #else
|
| #error The VideoAccelerator tests are not supported on this platform.
|
| @@ -553,6 +556,8 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
|
| base::Bind(&DoNothingReturnTrue),
|
| base::MessageLoopProxy::current()));
|
| #elif defined(ARCH_CPU_X86_FAMILY)
|
| + CHECK_EQ(gfx::kGLImplementationDesktopGL, gfx::GetGLImplementation())
|
| + << "Hardware video decode does not work with OSMesa";
|
| decoder_.reset(new VaapiVideoDecodeAccelerator(
|
| static_cast<Display*>(rendering_helper_->GetGLDisplay()),
|
| client,
|
|
|