VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/video_encode_accelerator_unittest.cc

Index: content/common/gpu/media/video_encode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc
index 23af266661b70e9ebcb01a78d028298381a9a538..d87a24c06625194da16110e46624ba30d2ae44c4 100644
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc
@@ -21,13 +21,13 @@
 #include "media/video/video_encode_accelerator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(USE_X11)
-#include "ui/gfx/x/x11_types.h"
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
 #endif
 
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 #include "content/common/gpu/media/v4l2_video_encode_accelerator.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_encode_accelerator.h"
 #else
 #error The VideoEncodeAcceleratorUnittest is not supported on this platform.
@@ -587,8 +587,8 @@ void VEAClient::CreateEncoder() {
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
   scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder);
   encoder_.reset(new V4L2VideoEncodeAccelerator(device.Pass()));
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
-  encoder_.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay()));
+#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+  encoder_.reset(new VaapiVideoEncodeAccelerator());
 #endif
 
   SetState(CS_ENCODER_SET);
@@ -1031,6 +1031,11 @@ int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);  // Removes gtest-specific args.
   base::CommandLine::Init(argc, argv);
 
+#if defined(USE_OZONE)
+  ui::OzonePlatform::InitializeForUI();

[Pawel Osciak, 2014/10/08 08:17:23]

There is no rendering in this test. Do we need these?

[llandwerlin-old, 2014/10/08 09:31:18]

Not sure what you call rendering, but this test paints using GL.
The last test also does a glReadPixels to verify that the rendered surface
matches a md5 hash in media/test/data/test-25fps.h264.md5

[Pawel Osciak, 2014/10/26 13:06:46]

This is the encoder test, I think you are mistaking it with the decoder one.
This one does not do any of these...

[llandwerlin-old, 2014/10/29 13:52:47]

Ah right, I misread the file name.
Though I need to initialize GL when using the gbm backend, we initialize libva
using the drm fd given by gbm_device_get_fd().
I guess this won't be a problem anymore when minigbm is used as it won't require
GL to be initialized.

+  ui::OzonePlatform::InitializeForGPU();
+#endif
+
   base::ShadowingAtExitManager at_exit_manager;
   scoped_ptr<base::FilePath::StringType> test_stream_data(
       new base::FilePath::StringType(
@@ -1056,6 +1061,8 @@ int main(int argc, char** argv) {
     }
     if (it->first == "v" || it->first == "vmodule")
       continue;
+    if (it->first == "ozone-platform" || it->first == "ozone-use-surfaceless")
+      continue;
     LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
   }