Enable vaapi, to support hardware acceleration (#106)

* Enable vaapi * Add libva * Don't install recommended packages
jrottenberg · Jun 21, 2018 · f52782d · f52782d
1 parent 551fa61
commit f52782d
Show file tree

Hide file tree

Showing 38 changed files with 177 additions and 0 deletions.
diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile
@@ -71,6 +71,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    zlib-dev \
+                   libva-dev \
                    expat-dev" && \
         apk  add --no-cache --update ${buildDeps}
 ## opencore-amr https://sourceforge.net/projects/opencore-amr/
@@ -340,6 +341,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -368,5 +370,8 @@ ENTRYPOINT  ["ffmpeg"]
 
 COPY --from=build /usr/local /usr/local
 
+RUN \
+	apk add --no-cache --update libva
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile
@@ -70,6 +70,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    which \
+                   libva-devel \
                    zlib-devel" && \
         echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \
         yum --enablerepo=extras install -y epel-release && \
@@ -341,6 +342,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64
 
 COPY --from=build /usr/local/ /usr/local/
 
+RUN \
+	yum install -y libva && \
+	rm -rf /var/cache/yum
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile
@@ -66,6 +66,7 @@ RUN     buildDeps="autoconf \
                    openssl-dev \
                    tar \
                    yasm \
+                   libva-dev \
                    zlib-dev" && \
         apk  add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0
 
@@ -336,6 +337,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \

diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile
@@ -72,6 +72,7 @@ RUN      buildDeps="autoconf \
                     python \
                     libssl-dev \
                     yasm \
+                    libva-dev \
                     zlib1g-dev" && \
         apt-get -yqq update && \
         apt-get install -yq --no-install-recommends ${buildDeps}
@@ -342,6 +343,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -370,5 +372,10 @@ ENV         LD_LIBRARY_PATH=/usr/local/lib
 
 COPY --from=build /usr/local /usr/local/
 
+RUN \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libva-drm1 libva1 && \
+	rm -rf /var/lib/apt/lists/*
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile
@@ -71,6 +71,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    zlib-dev \
+                   libva-dev \
                    expat-dev" && \
         apk  add --no-cache --update ${buildDeps}
 ## opencore-amr https://sourceforge.net/projects/opencore-amr/
@@ -340,6 +341,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -368,5 +370,8 @@ ENTRYPOINT  ["ffmpeg"]
 
 COPY --from=build /usr/local /usr/local
 
+RUN \
+	apk add --no-cache --update libva
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile
@@ -70,6 +70,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    which \
+                   libva-devel \
                    zlib-devel" && \
         echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \
         yum --enablerepo=extras install -y epel-release && \
@@ -341,6 +342,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64
 
 COPY --from=build /usr/local/ /usr/local/
 
+RUN \
+	yum install -y libva && \
+	rm -rf /var/cache/yum
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile
@@ -66,6 +66,7 @@ RUN     buildDeps="autoconf \
                    openssl-dev \
                    tar \
                    yasm \
+                   libva-dev \
                    zlib-dev" && \
         apk  add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0
 
@@ -336,6 +337,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \

diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile
@@ -72,6 +72,7 @@ RUN      buildDeps="autoconf \
                     python \
                     libssl-dev \
                     yasm \
+                    libva-dev \
                     zlib1g-dev" && \
         apt-get -yqq update && \
         apt-get install -yq --no-install-recommends ${buildDeps}
@@ -342,6 +343,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -370,5 +372,10 @@ ENV         LD_LIBRARY_PATH=/usr/local/lib
 
 COPY --from=build /usr/local /usr/local/
 
+RUN \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libva-drm1 libva1 && \
+	rm -rf /var/lib/apt/lists/*
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile
@@ -71,6 +71,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    zlib-dev \
+                   libva-dev \
                    expat-dev" && \
         apk  add --no-cache --update ${buildDeps}
 ## opencore-amr https://sourceforge.net/projects/opencore-amr/
@@ -340,6 +341,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -368,5 +370,8 @@ ENTRYPOINT  ["ffmpeg"]
 
 COPY --from=build /usr/local /usr/local
 
+RUN \
+	apk add --no-cache --update libva
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile
@@ -70,6 +70,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    which \
+                   libva-devel \
                    zlib-devel" && \
         echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \
         yum --enablerepo=extras install -y epel-release && \
@@ -341,6 +342,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64
 
 COPY --from=build /usr/local/ /usr/local/
 
+RUN \
+	yum install -y libva && \
+	rm -rf /var/cache/yum
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile
@@ -66,6 +66,7 @@ RUN     buildDeps="autoconf \
                    openssl-dev \
                    tar \
                    yasm \
+                   libva-dev \
                    zlib-dev" && \
         apk  add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0
 
@@ -336,6 +337,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \

diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile
@@ -72,6 +72,7 @@ RUN      buildDeps="autoconf \
                     python \
                     libssl-dev \
                     yasm \
+                    libva-dev \
                     zlib1g-dev" && \
         apt-get -yqq update && \
         apt-get install -yq --no-install-recommends ${buildDeps}
@@ -342,6 +343,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -370,5 +372,10 @@ ENV         LD_LIBRARY_PATH=/usr/local/lib
 
 COPY --from=build /usr/local /usr/local/
 
+RUN \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libva-drm1 libva1 && \
+	rm -rf /var/lib/apt/lists/*
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile
@@ -71,6 +71,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    zlib-dev \
+                   libva-dev \
                    expat-dev" && \
         apk  add --no-cache --update ${buildDeps}
 ## opencore-amr https://sourceforge.net/projects/opencore-amr/
@@ -340,6 +341,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -368,5 +370,8 @@ ENTRYPOINT  ["ffmpeg"]
 
 COPY --from=build /usr/local /usr/local
 
+RUN \
+	apk add --no-cache --update libva
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile
@@ -70,6 +70,7 @@ RUN     buildDeps="autoconf \
                    tar \
                    yasm \
                    which \
+                   libva-devel \
                    zlib-devel" && \
         echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \
         yum --enablerepo=extras install -y epel-release && \
@@ -341,6 +342,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64
 
 COPY --from=build /usr/local/ /usr/local/
 
+RUN \
+	yum install -y libva && \
+	rm -rf /var/cache/yum
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output
diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile
@@ -66,6 +66,7 @@ RUN     buildDeps="autoconf \
                    openssl-dev \
                    tar \
                    yasm \
+                   libva-dev \
                    zlib-dev" && \
         apk  add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0
 
@@ -336,6 +337,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \

diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile
@@ -72,6 +72,7 @@ RUN      buildDeps="autoconf \
                     python \
                     libssl-dev \
                     yasm \
+                    libva-dev \
                     zlib1g-dev" && \
         apt-get -yqq update && \
         apt-get install -yq --no-install-recommends ${buildDeps}
@@ -342,6 +343,7 @@ RUN  \
         --enable-postproc \
         --enable-small \
         --enable-version3 \
+        --enable-vaapi \
         --extra-cflags="-I${PREFIX}/include" \
         --extra-ldflags="-L${PREFIX}/lib" \
         --extra-libs=-ldl \
@@ -370,5 +372,10 @@ ENV         LD_LIBRARY_PATH=/usr/local/lib
 
 COPY --from=build /usr/local /usr/local/
 
+RUN \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libva-drm1 libva1 && \
+	rm -rf /var/lib/apt/lists/*
+
 # Let's make sure the app built correctly
 # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output