Merge pull request #66 from AkashiSN/master

Add webp support and enable ffplay

Author: markus-perl

Dockerfile

@@ -14,16 +14,22 @@ RUN SKIPINSTALL=yes /app/build-ffmpeg --build
 
 FROM ubuntu:20.04
 
+ENV DEBIAN_FRONTEND noninteractive
+
 # install va-driver
 RUN apt-get update \
     && apt-get -y install libva-drm2 \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
+# Copy ffmpeg
 COPY --from=build /app/workspace/bin/ffmpeg /usr/bin/ffmpeg
 COPY --from=build /app/workspace/bin/ffprobe /usr/bin/ffprobe
+COPY --from=build /app/workspace/bin/ffplay /usr/bin/ffplay
 
-RUN ldd /usr/bin/ffmpeg ; exit 0
-RUN ldd /usr/bin/ffprobe ; exit 0
+# Check shared library
+RUN ldd /usr/bin/ffmpeg
+RUN ldd /usr/bin/ffprobe
+RUN ldd /usr/bin/ffplay
 
 CMD         ["--help"]
 ENTRYPOINT  ["/usr/bin/ffmpeg"]

README.md

@@ -129,7 +129,7 @@ $ sudo -E docker build --tag=ffmpeg:cuda-$DIST -f cuda-$DIST.dockerfile --build-
 Since we have matched the operating system and version, it should work well with dynamic links. If it doesn't work, edit the `export.dockerfile` and copy the necessary libraries and try again.
 
 ```bash
-$ sudo -E docker build --output type=local,dest=build -f export.dockerfile .
+$ sudo -E docker build --output type=local,dest=build -f export.dockerfile --build-arg DIST=$DIST .
 $ ls build
 bin lib
 $ ls build/bin

build-ffmpeg

@@ -467,10 +467,36 @@ fi
 CONFIGURE_OPTIONS+=("--enable-libfdk-aac")
 
 
+##
+## image library
+##
+
+if build "libwebp"; then
+	download "https://github.com/webmproject/libwebp/archive/v1.1.0.tar.gz" "libwebp-1.1.0.tar.gz"
+	make_dir build
+	cd build || exit
+	execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
+	execute make -j $MJOBS
+	execute make install
+
+	build_done "libwebp"
+fi
+CONFIGURE_OPTIONS+=("--enable-libwebp")
+
+
 ##
 ## other library
 ##
 
+if build "libsdl"; then
+	download "https://www.libsdl.org/release/SDL2-2.0.12.tar.gz"
+	execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
+	execute make -j $MJOBS
+	execute make install
+
+	build_done "libsdl"
+fi
+
 if build "srt"; then
 	download "https://github.com/Haivision/srt/archive/v1.4.1.tar.gz" "srt-1.4.1.tar.gz"
 	export OPENSSL_ROOT_DIR="${WORKSPACE}"
@@ -535,7 +561,6 @@ download "https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2"
 ./configure "${CONFIGURE_OPTIONS[@]}" \
 	--disable-debug \
 	--disable-doc \
-	--disable-ffplay \
 	--disable-shared \
 	--enable-gpl \
 	--enable-nonfree \

cuda-centos.dockerfile

@@ -2,7 +2,8 @@ ARG VER=8
 
 FROM nvidia/cuda:11.1-devel-centos${VER} AS build
 
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 
 RUN yum group install -y "Development Tools" \
     && yum install -y curl libva-devel \
@@ -17,6 +18,9 @@ RUN SKIPINSTALL=yes /app/build-ffmpeg --build
 
 FROM centos:${VER}
 
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
+
 # install va-driver
 RUN yum install -y libva \
     && rm -rf /var/cache/yum/* \
@@ -31,9 +35,12 @@ COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/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
+COPY --from=build /app/workspace/bin/ffplay /usr/bin/ffplay
 
-RUN ldd /usr/bin/ffmpeg ; exit 0
-RUN ldd /usr/bin/ffprobe ; exit 0
+# Check shared library
+RUN ldd /usr/bin/ffmpeg
+RUN ldd /usr/bin/ffprobe
+RUN ldd /usr/bin/ffplay
 
 CMD         ["--help"]
 ENTRYPOINT  ["/usr/bin/ffmpeg"]

cuda-ubuntu.dockerfile

@@ -3,7 +3,8 @@ ARG VER=20.04
 FROM nvidia/cuda:11.1-devel-ubuntu${VER} AS build
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 
 RUN apt-get update \
     && apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
@@ -18,6 +19,10 @@ RUN SKIPINSTALL=yes /app/build-ffmpeg --build
 
 FROM ubuntu:${VER}
 
+ENV DEBIAN_FRONTEND noninteractive
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
+
 # install va-driver
 RUN apt-get update \
     && apt-get -y install libva-drm2 \
@@ -32,9 +37,12 @@ COPY --from=build /usr/local/cuda-11.1/targets/x86_64-linux/lib/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
+COPY --from=build /app/workspace/bin/ffplay /usr/bin/ffplay
 
-RUN ldd /usr/bin/ffmpeg ; exit 0
-RUN ldd /usr/bin/ffprobe ; exit 0
+# Check shared library
+RUN ldd /usr/bin/ffmpeg
+RUN ldd /usr/bin/ffprobe
+RUN ldd /usr/bin/ffplay
 
 CMD         ["--help"]
 ENTRYPOINT  ["/usr/bin/ffmpeg"]

export.dockerfile

@@ -1,11 +1,14 @@
+ARG DIST=ubuntu
+
 FROM scratch
 
 # Copy libnpp
-COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppc.so.11 /lib/libnppc.so.11
-COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppig.so.11 /lib/libnppig.so.11
-COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppicc.so.11 /lib/libnppicc.so.11
-COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppidei.so.11 /lib/libnppidei.so.11
+COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppc.so.11 /lib/libnppc.so.11
+COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppig.so.11 /lib/libnppig.so.11
+COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppicc.so.11 /lib/libnppicc.so.11
+COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppidei.so.11 /lib/libnppidei.so.11
 
 # Copy ffmpeg
-COPY --from=ffmpeg:cuda /usr/bin/ffmpeg /bin/ffmpeg
-COPY --from=ffmpeg:cuda /usr/bin/ffprobe /bin/ffprobe
+COPY --from=ffmpeg:cuda-${DIST} /usr/bin/ffmpeg /bin/ffmpeg
+COPY --from=ffmpeg:cuda-${DIST} /usr/bin/ffprobe /bin/ffprobe
+COPY --from=ffmpeg:cuda-${DIST} /usr/bin/ffplay /bin/ffplay

full-static.dockerfile

@@ -1,7 +1,8 @@
 FROM nvidia/cuda:11.1-devel-ubuntu20.04 AS build
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 
 RUN apt-get update \
     && apt-get -y --no-install-recommends install build-essential curl ca-certificates \
@@ -13,13 +14,20 @@ COPY ./build-ffmpeg /app/build-ffmpeg
 
 RUN AUTOINSTALL=yes /app/build-ffmpeg --build --full-static
 
-RUN ldd /app/workspace/bin/ffmpeg ; exit 0
-RUN ldd /app/workspace/bin/ffprobe ; exit 0
+# Check shared library
+RUN ! ldd /app/workspace/bin/ffmpeg
+RUN ! ldd /app/workspace/bin/ffprobe
+RUN ! ldd /app/workspace/bin/ffplay
 
 FROM scratch
 
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
+
+# Copy ffmpeg
 COPY --from=build /app/workspace/bin/ffmpeg /ffmpeg
 COPY --from=build /app/workspace/bin/ffprobe /ffprobe
+COPY --from=build /app/workspace/bin/ffplay /ffplay
 
 CMD         ["--help"]
 ENTRYPOINT  ["/ffmpeg"]