Changeset 227901 in webkit

Timestamp:

Jan 31, 2018, 8:11:57 AM (9 years ago)

Author:

Philippe Normand

Message:

[JHBuild] Add gstreamer-vaapi in moduleset
​https://bugs.webkit.org/show_bug.cgi?id=182283

Reviewed by Carlos Alberto Lopez Perez.

GStreamer-VAAPI is required for hardware-accelerated video
playback support on Intel and AMD (using radeosi driver)
platforms.

• gstreamer/jhbuild.modules: Add gstreamer-vaapi.
• gtk/install-dependencies: Install libva.
• wpe/install-dependencies: Ditto.
• Scripts/webkitpy/port/gtk.py:

(GtkPort.setup_environ_for_server): Disable va-api support when
testing because it's incompatible with Mesa's softGL driver.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/gtk.py (modified) (2 diffs)
• gstreamer/jhbuild.modules (modified) (2 diffs)
• gtk/install-dependencies (modified) (3 diffs)
• wpe/install-dependencies (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-01-31  Philippe Normand  <pnormand@igalia.com>
+
+        [JHBuild] Add gstreamer-vaapi in moduleset
+        https://bugs.webkit.org/show_bug.cgi?id=182283
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        GStreamer-VAAPI is required for hardware-accelerated video
+        playback support on Intel and AMD (using radeosi driver)
+        platforms.
+
+        * gstreamer/jhbuild.modules: Add gstreamer-vaapi.
+        * gtk/install-dependencies: Install libva.
+        * wpe/install-dependencies: Ditto.
+        * Scripts/webkitpy/port/gtk.py:
+        (GtkPort.setup_environ_for_server): Disable va-api support when
+        testing because it's incompatible with Mesa's softGL driver.
+
 2018-01-31  Charlie Turner  <cturner@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/gtk.py

@@ -122 +122 @@
         environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
         environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
-        environment['OWR_USE_TEST_SOURCES'] = '1'
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
 
@@ -131 +130 @@
             dri_libgl_path = os.path.join(llvmpipe_libgl_path, "dri")
             if os.path.exists(os.path.join(llvmpipe_libgl_path, "libGL.so")) and os.path.exists(os.path.join(dri_libgl_path, "swrast_dri.so")):
-                    # Force the Gallium llvmpipe software rasterizer
-                    environment['LIBGL_ALWAYS_SOFTWARE'] = "1"
-                    environment['LIBGL_DRIVERS_PATH'] = dri_libgl_path
-                    environment['LD_LIBRARY_PATH'] = llvmpipe_libgl_path
-                    if os.environ.get('LD_LIBRARY_PATH'):
-                            environment['LD_LIBRARY_PATH'] += ':%s' % os.environ.get('LD_LIBRARY_PATH')
+                # Make sure va-api support gets disabled because it's incompatible with Mesa's softGL driver.
+                environment['LIBVA_DRIVER_NAME'] = "null"
+                # Force the Gallium llvmpipe software rasterizer
+                environment['LIBGL_ALWAYS_SOFTWARE'] = "1"
+                environment['LIBGL_DRIVERS_PATH'] = dri_libgl_path
+                environment['LD_LIBRARY_PATH'] = llvmpipe_libgl_path
+                if os.environ.get('LD_LIBRARY_PATH'):
+                    environment['LD_LIBRARY_PATH'] += ':%s' % os.environ.get('LD_LIBRARY_PATH')
             else:
-                    _log.warning("Can't find Gallium llvmpipe driver. Try to run update-webkitgtk-libs")
+                _log.warning("Can't find Gallium llvmpipe driver. Try to run update-webkitgtk-libs")
         if self.get_option("leaks"):
             # Turn off GLib memory optimisations https://wiki.gnome.org/Valgrind.

trunk/Tools/gstreamer/jhbuild.modules

@@ -11 +11 @@
       <dep package="gst-plugins-bad"/>
       <dep package="gst-libav"/>
+      <dep package="gstreamer-vaapi"/>
     </dependencies>
   </metamodule>
@@ -104 +105 @@
   </autotools>
 
+  <autotools id="gstreamer-vaapi">
+    <branch module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" version="1.12.4"
+            repo="gstreamer"
+            hash="sha256:1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-bad"/>
+    </dependencies>
+   </autotools>
+
 </moduleset>

trunk/Tools/gtk/install-dependencies

@@ -197 +197 @@
         libssl-dev \
         libtiff5-dev \
+        libva-dev \
         libv4l-dev \
         libxcb-composite0-dev \
@@ -347 +348 @@
         libproxy \
         libtiff \
+        libva \
         libxfixes \
         libxfont \
@@ -509 +511 @@
         libproxy-devel \
         libtiff-devel \
+        libva-devel \
         libxcb-devel \
         libxkbfile-devel \

trunk/Tools/wpe/install-dependencies

@@ -119 +119 @@
         libtheora-dev \
         libtool-bin \
+        libva-dev \
         libvorbis-dev \
         libvpx-dev \
@@ -204 +205 @@
         libtheora \
         libv4l-dev \
+        libva \
         libvorbis \
         libvpx \
@@ -285 +287 @@
         libtheora-devel \
         libv4l-devel \
+        libva-devel \
         libvorbis-devel \
         libvpx-devel \