update vaapi

Author: AkashiSN

.github/workflows/build.yml

@@ -74,8 +74,8 @@ jobs:
         run: |
           docker run --rm ffmpeg:ubuntu -buildconf
 
-  build-cuda-docker:
-    name: build in docker with cuda
+  build-cuda-ubuntu-docker:
+    name: build in ubuntu docker with cuda
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
@@ -93,10 +93,34 @@ jobs:
           docker pull ubuntu:20.04
       - name: build ffmpeg
         run: |
-          docker build -t ffmpeg:cuda -f cuda.dockerfile .
+          docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
       - name: test run ffmepg
         run: |
-          docker run --rm ffmpeg:cuda -buildconf
+          docker run --rm ffmpeg:cuda-ubuntu -buildconf
+
+  build-cuda-centos-docker:
+    name: build in centos docker with cuda
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: pull base image
+        id: cuda_centos_pull
+        run: |
+          docker pull nvidia/cuda:11.1-devel-centos8
+          docker pull centos:8
+      - name: run if cuda_centos_pull failed
+        if: failure() && steps.cuda_centos_pull.outcome == 'failure'
+        run: |
+          docker pull nvidia/cuda:11.1-devel-centos8
+          docker pull centos:8
+      - name: build ffmpeg
+        run: |
+          docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile .
+      - name: test run ffmepg
+        run: |
+          docker run --rm ffmpeg:cuda-centos -buildconf
 
   build-full-static:
     name: full static build in docker
@@ -106,11 +130,11 @@ jobs:
         uses: actions/checkout@v2
 
       - name: pull base image
-        id: cuda_ubuntu_centos_pull
+        id: cuda_ubuntu_pull
         run: |
           docker pull nvidia/cuda:11.1-devel-ubuntu20.04
-      - name: run if cuda_ubuntu_centos_pull failed
-        if: failure() && steps.cuda_ubuntu_centos_pull.outcome == 'failure'
+      - name: run if cuda_ubuntu_pull failed
+        if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
         run: |
           docker pull nvidia/cuda:11.1-devel-ubuntu20.04
       - name: build ffmpeg

Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:20.04 AS build
 
 RUN apt-get update \
-    && apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 \
+    && apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 i965-va-driver \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
     && update-ca-certificates
 
@@ -12,6 +12,11 @@ RUN SKIPINSTALL=yes /app/build-ffmpeg --build
 
 FROM ubuntu:20.04
 
+# install va-driver
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install libva-drm2 \
+    && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
 COPY --from=build /app/workspace/bin/ffmpeg /usr/bin/ffmpeg
 COPY --from=build /app/workspace/bin/ffprobe /usr/bin/ffprobe
 

README.md

@@ -52,7 +52,7 @@ because I don't have the resources and the time to maintain other systems.
     * Encoders
         * H264 `h264_amf`
         * H265 `hevc_amf`
-* `vaapi`: [Video Acceleration API](https://trac.ffmpeg.org/wiki/Hardware/VAAPI). Supported codecs in vaapi:
+* `vaapi`: [Video Acceleration API](https://trac.ffmpeg.org/wiki/Hardware/VAAPI). Installation is triggered only if libva driver installation is detected, follow [these](#Vaapi-installation) instructions for installation. Supported codecs in vaapi:
     * Encoders
         * H264 `h264_vaapi`
         * H265 `hevc_vaapi`
@@ -78,7 +78,7 @@ ffmpeg-build-script is rockstable. Every commit runs against Linux and MacOS wit
 
 ```bash
 # Debian and Ubuntu
-$ sudo apt-get install build-essential curl python3
+$ sudo apt install build-essential curl python3
 
 # Fedora
 $ sudo dnf install @development-tools curl python3
@@ -125,7 +125,7 @@ $ export VER=8
 
 3. Start the docker build as follows.
 ```bash
-$ sudo -E docker build --tag=ffmpeg:cuda -f cuda.dockerfile --build-arg DIST=$DIST --build-arg VER=$VER .
+$ sudo -E docker build --tag=ffmpeg:cuda-$DIST -f cuda-$DIST.dockerfile --build-arg VER=$VER .
 ```
 
 4. Build an `export.dockerfile` that copies only what you need from the image you just built as follows. When running, move the library in the lib to a location where the linker can find it or set the `LD_LIBRARY_PATH`.
@@ -186,8 +186,19 @@ To be able to compile ffmpeg with CUDA support, you first need a compatible NVID
 or [this blog](https://www.pugetsystems.com/labs/hpc/How-To-Install-CUDA-10-1-on-Ubuntu-19-04-1405/)
 to setup the CUDA toolkit.
 
-Usage
-------
+## Vaapi installation
+
+You will need the libva driver, so please install it below.
+
+```bash
+# Debian and Ubuntu
+$ sudo apt install vainfo
+
+# Fedora and CentOS
+$ sudo dnf install libva libva-intel-driver libva-utils
+```
+
+## Usage
 
 ```bash
 Usage: build-ffmpeg [OPTIONS]
@@ -205,6 +216,7 @@ Options:
   See detail below: https://sourceware.org/glibc/wiki/FAQ#Even_statically_linked_programs_need_some_shared_libraries_which_is_not_acceptable_for_me.__What_can_I_do.3F
 
 - The libnpp in the CUDA SDK cannot be statically linked.
+- Vaapi cannot be statically linked.
 
 Contact
 -------

build-ffmpeg

@@ -123,14 +123,25 @@ build () {
 	return 0
 }
 
-command_exists() {
+command_exists () {
 	if ! [[ -x $(command -v "$1") ]]; then
 		return 1
 	fi
 
 	return 0
 }
 
+library_exists () {
+	if ! command_exists "ldconfig"; then
+		return 1
+	fi
+
+	if ! [ -n "$(ldconfig -p | grep "$1")" ]; then
+		return 1
+	fi
+
+	return 0
+}
 
 build_done () {
 	touch "$PACKAGES/$1.done"
@@ -550,7 +561,7 @@ CONFIGURE_OPTIONS+=("--enable-libsrt")
 ##
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	if command_exists nvcc ; then
+	if command_exists "nvcc" ; then
 		if build "nv-codec"; then
 			download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.0/nv-codec-headers-11.0.10.0.tar.gz"
 			execute make PREFIX="${WORKSPACE}"
@@ -577,39 +588,46 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 	fi
 	CONFIGURE_OPTIONS+=("--enable-amf")
 
-	if build "libpciaccess"; then
-		download "https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/archive/libpciaccess-0.16/libpciaccess-libpciaccess-0.16.tar.bz2" "libpciaccess-0.16.tar.bz2"
-		execute autoreconf --force --verbose --install
-		execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static CFLAGS=-fPIC
-		execute make -j $MJOBS
-		execute make install
-		build_done "libpciaccess"
-	fi
+	# Vaapi doesn't work well with static links ffmpeg.
+	if [ -z "$LDEXEFLAGS" ]; then
+		if library_exists "libdrm" ; then
+			if build "libpciaccess"; then
+				download "https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/archive/libpciaccess-0.16/libpciaccess-libpciaccess-0.16.tar.bz2" "libpciaccess-0.16.tar.bz2"
+				execute autoreconf --force --verbose --install
+				execute ./configure --prefix="${WORKSPACE}" --disable-static --enable-shared CFLAGS=-fPIC
+				execute make -j $MJOBS
+				execute make install
+				build_done "libpciaccess"
+			fi
 
-	if build "libdrm"; then
-		download "https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-2.4.102/drm-libdrm-2.4.102.tar.bz2" "libdrm-2.4.102.tar.bz2"
-		execute meson --prefix="${WORKSPACE}" --libdir="${WORKSPACE}"/lib builddir/
-		execute ninja -C builddir/ install
-		build_done "libdrm"
-	fi
+			# https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/28
+			# Since libdrm should not be statically linked, neither should libva or intel-vaapi-driver, on which it depends, be statically linked.
+			# They should be installed as drivers in your host OS.
+			if build "libdrm"; then
+				download "https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-2.4.102/drm-libdrm-2.4.102.tar.bz2" "libdrm-2.4.102.tar.bz2"
+				execute meson --prefix="${WORKSPACE}" --libdir="${WORKSPACE}"/lib builddir/
+				execute ninja -C builddir/ install
+				build_done "libdrm"
+			fi
 
-	if build "libva"; then
-		download "https://github.com/intel/libva/releases/download/2.9.0/libva-2.9.0.tar.bz2"
-		execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
-		execute make -j $MJOBS
-		execute make install
-		build_done "libva"
-	fi
+			if build "libva"; then
+				download "https://github.com/intel/libva/releases/download/2.9.0/libva-2.9.0.tar.bz2"
+				execute ./configure --prefix="${WORKSPACE}" --disable-static --enable-shared
+				execute make -j $MJOBS
+				execute make install
+				build_done "libva"
+			fi
 
-	if build "intel-vaapi-driver"; then
-		download "https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi-driver-2.4.1.tar.bz2"
-		execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
-		execute make -j $MJOBS
-		execute make install
-		build_done "intel-vaapi-driver"
+			if build "intel-vaapi-driver"; then
+				download "https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi-driver-2.4.1.tar.bz2"
+				execute ./configure --prefix="${WORKSPACE}" --disable-static --enable-shared
+				execute make -j $MJOBS
+				execute make install
+				build_done "intel-vaapi-driver"
+			fi
+			CONFIGURE_OPTIONS+=("--enable-vaapi")
+		fi
 	fi
-
-	CONFIGURE_OPTIONS+=("--enable-vaapi")
 fi
 
 

cuda-centos.dockerfile

@@ -0,0 +1,39 @@
+ARG VER=8
+
+FROM nvidia/cuda:11.1-devel-centos${VER} AS build
+
+ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
+
+RUN yum groupinstall -y "Development Tools" \
+    && yum install -y kernel-devel kernel-headers curl python3 vaapi-driver-i965 \
+    && rm -rf /var/cache/yum/* \
+    && yum clean all
+
+WORKDIR /app
+COPY ./build-ffmpeg /app/build-ffmpeg
+
+RUN SKIPINSTALL=yes /app/build-ffmpeg --build
+
+
+FROM centos:${VER}
+
+# install va-driver
+RUN yum install -y libva \
+    && rm -rf /var/cache/yum/* \
+    && yum clean all
+
+# Copy libnpp
+COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/libnppc.so.11 /lib/x86_64-linux-gnu/libnppc.so.11
+COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/libnppig.so.11 /lib/x86_64-linux-gnu/libnppig.so.11
+COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/libnppicc.so.11 /lib/x86_64-linux-gnu/libnppicc.so.11
+COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/libnppidei.so.11 /lib/x86_64-linux-gnu/libnppidei.so.11
+
+# Copy ffmpeg
+COPY --from=build /app/workspace/bin/ffmpeg /usr/bin/ffmpeg
+COPY --from=build /app/workspace/bin/ffprobe /usr/bin/ffprobe
+
+RUN ldd /usr/bin/ffmpeg ; exit 0
+RUN ldd /usr/bin/ffprobe ; exit 0
+
+CMD         ["--help"]
+ENTRYPOINT  ["/usr/bin/ffmpeg"]

cuda.dockerfile renamed to cuda-ubuntu.dockerfile

@@ -1,12 +1,11 @@
-ARG DIST=ubuntu
 ARG VER=20.04
 
-FROM nvidia/cuda:11.1-devel-${DIST}${VER} AS build
+FROM nvidia/cuda:11.1-devel-ubuntu${VER} AS build
 
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
 
 RUN apt-get update \
-    && apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 \
+    && apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 i965-va-driver \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
     && update-ca-certificates
 
@@ -16,7 +15,12 @@ COPY ./build-ffmpeg /app/build-ffmpeg
 RUN SKIPINSTALL=yes /app/build-ffmpeg --build
 
 
-FROM ${DIST}:${VER}
+FROM ubuntu:${VER}
+
+# install va-driver
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install libva-drm2 \
+    && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # Copy libnpp
 COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/libnppc.so.11 /lib/x86_64-linux-gnu/libnppc.so.11