Skip to content

Commit 27f6e0f

Browse files
committed
Add libwebp support
1 parent e7140e2 commit 27f6e0f

File tree

7 files changed

+43
-10
lines changed

7 files changed

+43
-10
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ RUN SKIPINSTALL=yes /app/build-ffmpeg --build
1414

1515
FROM ubuntu:20.04
1616

17+
ENV DEBIAN_FRONTEND noninteractive
18+
1719
# install va-driver
1820
RUN apt-get update \
1921
&& apt-get -y install libva-drm2 \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ $ sudo -E docker build --tag=ffmpeg:cuda-$DIST -f cuda-$DIST.dockerfile --build-
129129
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.
130130

131131
```bash
132-
$ sudo -E docker build --output type=local,dest=build -f export.dockerfile .
132+
$ sudo -E docker build --output type=local,dest=build -f export.dockerfile --build-arg DIST=$DIST .
133133
$ ls build
134134
bin lib
135135
$ ls build/bin

build-ffmpeg

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,22 @@ fi
467467
CONFIGURE_OPTIONS+=("--enable-libfdk-aac")
468468

469469

470+
##
471+
## image library
472+
##
473+
474+
if build "libwebp"; then
475+
download "https://github.com/webmproject/libwebp/archive/v1.1.0.tar.gz" "libwebp-1.1.0.tar.gz"
476+
make_dir build
477+
cd build || exit
478+
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
479+
execute make -j $MJOBS
480+
execute make install
481+
482+
build_done "libwebp"
483+
fi
484+
CONFIGURE_OPTIONS+=("--enable-libwebp")
485+
470486
##
471487
## other library
472488
##

cuda-centos.dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ ARG VER=8
22

33
FROM nvidia/cuda:11.1-devel-centos${VER} AS build
44

5-
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
5+
ENV NVIDIA_VISIBLE_DEVICES all
6+
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
67

78
RUN yum group install -y "Development Tools" \
89
&& yum install -y curl libva-devel \
@@ -17,6 +18,9 @@ RUN SKIPINSTALL=yes /app/build-ffmpeg --build
1718

1819
FROM centos:${VER}
1920

21+
ENV NVIDIA_VISIBLE_DEVICES all
22+
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
23+
2024
# install va-driver
2125
RUN yum install -y libva \
2226
&& rm -rf /var/cache/yum/* \

cuda-ubuntu.dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ ARG VER=20.04
33
FROM nvidia/cuda:11.1-devel-ubuntu${VER} AS build
44

55
ENV DEBIAN_FRONTEND noninteractive
6-
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
6+
ENV NVIDIA_VISIBLE_DEVICES all
7+
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
78

89
RUN apt-get update \
910
&& 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
1819

1920
FROM ubuntu:${VER}
2021

22+
ENV DEBIAN_FRONTEND noninteractive
23+
ENV NVIDIA_VISIBLE_DEVICES all
24+
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
25+
2126
# install va-driver
2227
RUN apt-get update \
2328
&& apt-get -y install libva-drm2 \

export.dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
ARG DIST=ubuntu
2+
13
FROM scratch
24

35
# Copy libnpp
4-
COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppc.so.11 /lib/libnppc.so.11
5-
COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppig.so.11 /lib/libnppig.so.11
6-
COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppicc.so.11 /lib/libnppicc.so.11
7-
COPY --from=ffmpeg:cuda /lib/x86_64-linux-gnu/libnppidei.so.11 /lib/libnppidei.so.11
6+
COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppc.so.11 /lib/libnppc.so.11
7+
COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppig.so.11 /lib/libnppig.so.11
8+
COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppicc.so.11 /lib/libnppicc.so.11
9+
COPY --from=ffmpeg:cuda-${DIST} /lib/x86_64-linux-gnu/libnppidei.so.11 /lib/libnppidei.so.11
810

911
# Copy ffmpeg
10-
COPY --from=ffmpeg:cuda /usr/bin/ffmpeg /bin/ffmpeg
11-
COPY --from=ffmpeg:cuda /usr/bin/ffprobe /bin/ffprobe
12+
COPY --from=ffmpeg:cuda-${DIST} /usr/bin/ffmpeg /bin/ffmpeg
13+
COPY --from=ffmpeg:cuda-${DIST} /usr/bin/ffprobe /bin/ffprobe

full-static.dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM nvidia/cuda:11.1-devel-ubuntu20.04 AS build
22

33
ENV DEBIAN_FRONTEND noninteractive
4-
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
4+
ENV NVIDIA_VISIBLE_DEVICES all
5+
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
56

67
RUN apt-get update \
78
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates \
@@ -18,6 +19,9 @@ RUN ldd /app/workspace/bin/ffprobe ; exit 0
1819

1920
FROM scratch
2021

22+
ENV NVIDIA_VISIBLE_DEVICES all
23+
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
24+
2125
COPY --from=build /app/workspace/bin/ffmpeg /ffmpeg
2226
COPY --from=build /app/workspace/bin/ffprobe /ffprobe
2327

0 commit comments

Comments
 (0)