Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions docker-images/7.1/nvidia2404/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
#
# Stage 1: Build ( https://hub.docker.com/r/nvidia/cuda )
FROM nvidia/cuda:12.6.2-devel-ubuntu24.04 AS builder
FROM nvidia/cuda:12.9.0-devel-ubuntu24.04 AS builder

ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -18,9 +18,9 @@ COPY download_tarballs.sh /tmp/workdir
COPY build_source.sh /tmp/workdir
COPY install_ffmpeg.sh /tmp/workdir

ENV ENV FFMPEG_VERSION=7.1.1
ENV FFMPEG_VERSION=7.1.1

ENV NVIDIA_HEADERS_VERSION=11.1.5.3
#ENV NVIDIA_HEADERS_VERSION=11.1.5.3

## opencore-amr - https://sourceforge.net/projects/opencore-amr/
## x264 - http://www.videolan.org/developers/x264.html
Expand Down Expand Up @@ -161,6 +161,7 @@ RUN buildDeps="autoconf \
expat \
libgomp1 \
ca-certificates \
xxd \
libxcb-shape0-dev \
libavformat-dev" && \
apt-get -yqq update && \
Expand Down Expand Up @@ -200,7 +201,7 @@ RUN /tmp/workdir/install_ffmpeg.sh

# Stage 2: Final Image ( shrink the size back down )
# FROM nvidia/cuda:12.6.2-runtime-ubuntu24.04
FROM nvidia/cuda:12.6.2-base-ubuntu24.04 AS runtime
FROM nvidia/cuda:12.9.0-base-ubuntu24.04 AS runtime
# We used to use runtime, but I switched us to base, as it is significantly-smaller.
# (~ 80Megs ) base: Includes the CUDA runtime (cudart)
# (~ 1.4Gigs) runtime: Builds on the base and includes the CUDA math libraries⁠, and NCCL⁠.
Expand Down Expand Up @@ -230,7 +231,7 @@ RUN apt-get -yqq update && \
LABEL org.opencontainers.image.authors="julien@rottenberg.info" \
org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg

ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/usr/local/cuda-12.9/compat/

CMD ["--help"]
ENTRYPOINT ["ffmpeg"]
2 changes: 1 addition & 1 deletion docker-images/7.1/nvidia2404/build_source.sh
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ build_libvmaf() {
# https://github.com/Netflix/vmaf/issues/788#issuecomment-756098059
mkdir ./libvmaf/build
cd ./libvmaf/build
meson setup -Denable_tests=false -Denable_docs=false --buildtype=release --default-library=static --prefix "${PREFIX}" .. && \
meson setup -Denable_tests=false -Denable_docs=false -Denable_cuda=true --buildtype=release --default-library=static --prefix "${PREFIX}" .. && \
# meson setup -Denable_tests=false -Denable_docs=false --buildtype=release --default-library=shared --prefix "${PREFIX}" ..
ninja
ninja install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@
LIBARIBB24 = {"version": "1.0.3", "release_date": "2014-08-18"}
OPENJPEG = {"version": "2.5.2", "release_date": "2024-02-28"}
THEORA = {"version": "1.1.1", "release_date": "2010-01-25"}
LIBVMAF = {"version": "3.0.0", "release_date": "2023-12-07"}
# libvmaf to old for cuda we need use master branch
# https://github.com/Netflix/vmaf/issues/1357
LIBVMAF = {"version": "master", "release_date": "2023-12-07"}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't got with a branch name, even master, it should be a tag, the project is active I wonder why they are not publishing a tag at least !


# Library details, Source of truth
# TODO: store this in a yaml confiuration file ( would probably be better )
Expand Down Expand Up @@ -636,9 +638,11 @@
"license_name": "BSD-2-Clause",
"license_link": "https://github.com/Netflix/vmaf/blob/master/LICENSE",
"build_info": {
"download_link": f"https://github.com/Netflix/vmaf/archive/refs/tags/v{LIBVMAF['version']}.tar.gz",
#"download_link": f"https://github.com/Netflix/vmaf/archive/refs/tags/v{LIBVMAF['version']}.tar.gz",
"download_link":"https://github.com/Netflix/vmaf/archive/refs/heads/master.tar.gz",
"build_dir": "/tmp/vmaf",
"tarball_name": f"vmaf-v{LIBVMAF['version']}.tar.gz",
#"tarball_name": f"vmaf-v{LIBVMAF['version']}.tar.gz",
},
},
),
Expand Down