VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 0417e929c1830605516ed89d13564e2afb2dfc0a..6c5f8b853bf4781a939ce54d23735fbf2cf38864 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -7,12 +7,17 @@ import("//build/config/ui.gni")
 import("//content/common/common.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
-if (is_chromeos && use_x11 && cpu_arch != "arm") {
+if (is_chromeos && cpu_arch != "arm") {
   action("libva_generate_stubs") {
     extra_header = "gpu/media/va_stub_header.fragment"
 
     script = "../../tools/generate_stubs/generate_stubs.py"
     sources = [ "gpu/media/va.sigs" ]
+    if (use_x11) {
+      sources += [ "content/common/gpu/media/va_x11.sigs" ]
+    } else {

[Pawel Osciak, 2014/12/08 10:55:15]

Do we need use_ozone here?

[llandwerlin-old, 2014/12/08 16:42:06]

Done.

+      sources += [ "content/common/gpu/media/va_drm.sigs" ]
+    }
     source_prereqs = [ extra_header ]
     stubs_filename_root = "va_stubs"
 
@@ -228,8 +233,8 @@ source_set("common") {
     }
   }
 
-  if (is_chromeos && use_x11) {
-    if (cpu_arch == "arm") {
+  if (is_chromeos) {
+    if (cpu_arch == "arm" && use_x11) {
       sources += [
         "gpu/media/exynos_v4l2_video_device.cc",
         "gpu/media/exynos_v4l2_video_device.h",
@@ -252,6 +257,7 @@ source_set("common") {
         "gpu/media/va_surface.h",
         "gpu/media/vaapi_h264_decoder.cc",
         "gpu/media/vaapi_h264_decoder.h",
+        "gpu/media/vaapi_picture.h",
         "gpu/media/vaapi_video_decode_accelerator.cc",
         "gpu/media/vaapi_video_decode_accelerator.h",
         "gpu/media/vaapi_video_encode_accelerator.cc",
@@ -268,6 +274,17 @@ source_set("common") {
         "//media",
         "//third_party/libyuv",
       ]
+      if (use_x11) {
+        sources += [
+          "gpu/media/vaapi_tfp_picture.cc",
+          "gpu/media/vaapi_tfp_picture.h",
+        ]
+      } else {
+        sources += [
+          "gpu/media/vaapi_drm_picture.cc",
+          "gpu/media/vaapi_drm_picture.h",
+        ]
+      }
     }
   }