Refactor Vaapi video decoder/encoder in preparation of Freon support

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index a1ec31f43a6f9e84c6aff2d5459ad3f3e961faf6..c988708c5d31b3bb9a66675f7733d0ef3975338c 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -18,6 +18,9 @@ if (is_chromeos && use_x11 && cpu_arch != "arm") {
     inputs = [
       extra_header,
     ]
+    if (use_x11) {
+      sources += [ "content/common/gpu/media/va_x11.sigs" ]
+    }
     stubs_filename_root = "va_stubs"
 
     outputs = [
@@ -273,8 +276,8 @@ source_set("common") {
     }
   }
 
-  if (is_chromeos && use_x11) {
-    if (cpu_arch == "arm") {
+  if (is_chromeos) {
+    if (cpu_arch == "arm" && use_x11) {

[piman, 2014/12/17 18:57:06]

I don't think this is right - we don't want to use vaapi on arm && !use_x11

[llandwerlin-old, 2014/12/17 21:24:58]

The logic indicates that's what was enabled before.

For ChromeOS, hardware video decode/encode is only available with X11.
I'm just relaxing the constraint x86, where this CL allows it all the time (even
though it's going to fail at runtime).

[piman, 2014/12/17 21:42:02]

No... in the chromeos and !use_x11 case we would skip the entire (is_chromeos &&
use_x11) block.
After your change, we would go inside the is_chromeos block, fail the (cpu_arch
== "arm" && use_x11) if, so use the else clause and try to use vaapi.
I understand the intent, but I don't think that's what you've done here.

       sources += [
         "gpu/media/exynos_v4l2_video_device.cc",
         "gpu/media/exynos_v4l2_video_device.h",
@@ -300,6 +303,8 @@ source_set("common") {
                    "gpu/media/va_surface.h",
                    "gpu/media/vaapi_h264_decoder.cc",
                    "gpu/media/vaapi_h264_decoder.h",
+                   "gpu/media/vaapi_picture.cc",
+                   "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",
@@ -316,6 +321,12 @@ source_set("common") {
         "//media",
         "//third_party/libyuv",
       ]
+      if (use_x11) {
+        sources += [
+          "gpu/media/vaapi_tfp_picture.cc",
+          "gpu/media/vaapi_tfp_picture.h",
+        ]
+      }
     }
   }