VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ab93e54253a3e87df31e62de7ae9d33372238a7e..706a443c8c2317363e5d71981f4764c0dd40a0a8 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -772,7 +772,7 @@
         '<(DEPTH)/third_party/khronos',
       ],
     }],
-    ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+    ['target_arch != "arm" and chromeos == 1', {

[vignatti (out of this project), 2014/10/31 19:07:58]

here we need to opt out also platforms that don't provide hw acceleration, e.g.
Ozone DRI, testing etc

[llandwerlin-old, 2014/11/03 09:30:11]

Acknowledged.

       'dependencies': [
         '../media/media.gyp:media',
         '../third_party/libyuv/libyuv.gyp:libyuv',
@@ -783,6 +783,8 @@
         'common/gpu/media/va_surface.h',
         'common/gpu/media/vaapi_h264_decoder.cc',
         'common/gpu/media/vaapi_h264_decoder.h',
+        'common/gpu/media/vaapi_picture_provider.cc',
+        'common/gpu/media/vaapi_picture_provider.h',
         'common/gpu/media/vaapi_video_decode_accelerator.cc',
         'common/gpu/media/vaapi_video_decode_accelerator.h',
         'common/gpu/media/vaapi_video_encode_accelerator.cc',
@@ -790,10 +792,35 @@
         'common/gpu/media/vaapi_wrapper.cc',
         'common/gpu/media/vaapi_wrapper.h',
       ],
+      'conditions': [
+        ['use_x11 == 1', {
+          'variables': {
+            'sig_files': [
+              'common/gpu/media/va.sigs',
+              'common/gpu/media/va_x11.sigs',
+            ],
+          },
+          'sources': [
+            'common/gpu/media/vaapi_picture_provider_x11.cc',
+            'common/gpu/media/vaapi_picture_provider_x11.h',
+          ],
+        }],
+        ['ozone_platform_gbm == 1', {
+          'variables': {
+            'sig_files': [
+              'common/gpu/media/va.sigs',
+              'common/gpu/media/va_drm.sigs',
+            ],
+          },
+          'sources': [
+            'common/gpu/media/vaapi_picture_provider_drm.cc',
+            'common/gpu/media/vaapi_picture_provider_drm.h',
+          ],
+        }],
+      ],
       'variables': {
         'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
         'extra_header': 'common/gpu/media/va_stub_header.fragment',
-        'sig_files': ['common/gpu/media/va.sigs'],
         'outfile_type': 'posix_stubs',
         'stubs_filename_root': 'va_stubs',
         'project_path': 'content/common/gpu/media',