add ffmpeg:7.0.2

AkashiSN · AkashiSN · commit 94b28e151ced · 2024-09-15T21:24:17.000+09:00
diff --git a/.github/workflows/ffmpeg-release.yml b/.github/workflows/ffmpeg-release.yml
@@ -12,7 +12,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     strategy:
       matrix:
-        ffmpeg: ["6.0", "5.1.3", "4.4.4"]
+        ffmpeg: ["7.0.2", "6.1.2", "5.1.6", "4.4.5"]
         flavor: [linux, windows]
     steps:
       - name: Checkout
@@ -63,4 +63,4 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: /tmp/artifact/**/*.tar.xz
+          files: /tmp/artifact/**/*.tar.xz
diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
@@ -20,7 +20,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/') == false && (github.event_name == 'push' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success'))
     strategy:
       matrix:
-        ffmpeg: ["6.0", "5.1.3", "4.4.4"]
+        ffmpeg: ["7.0.2", "6.1.2", "5.1.6", "4.4.5"]
         flavor: [linux, windows]
     steps:
       - name: Checkout
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.5
 
-ARG FFMPEG_VERSION="6.0"
+ARG FFMPEG_VERSION="7.0.2"
 FROM akashisn/ffmpeg:${FFMPEG_VERSION} AS ffmpeg-linux-image
 FROM ghcr.io/akashisn/ffmpeg-windows:${FFMPEG_VERSION} AS ffmpeg-windows-image
 
diff --git a/nonfree.Dockerfile b/nonfree.Dockerfile
@@ -1,50 +1,81 @@
-# syntax = docker/dockerfile:1.3-labs
+# syntax = docker/dockerfile:1.5
 
+ARG FFMPEG_VERSION="7.0.2"
 ARG TARGET_OS="linux"
-ARG CUDA_SDK_VERSION=11.6.0
+ARG CUDA_SDK_VERSION="12.2.0"
+FROM ghcr.io/akashisn/ffmpeg-library:${TARGET_OS} AS ffmpeg-library
 
-FROM ghcr.io/akashisn/ffmpeg-library-build:${TARGET_OS} AS ffmpeg-library-build
-
-FROM nvidia/cuda:${CUDA_SDK_VERSION}-devel-ubuntu20.04 AS ffmpeg-build
+#
+# cuda build env base image
+#
+FROM nvidia/cuda:${CUDA_SDK_VERSION}-devel-ubuntu22.04 AS cuda-build-env
 
 SHELL ["/bin/bash", "-e", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 
-# Install build tools
+# Install ca-certificates
 RUN <<EOT
+apt-get update
+apt-get install -y ca-certificates
 rm -rf /var/lib/apt/lists/*
-sed -i -r 's!(deb|deb-src) \S+!\1 http://jp.archive.ubuntu.com/ubuntu/!' /etc/apt/sources.list
+EOT
+
+# Install build tools
+RUN <<EOT
+sed -i -r 's@http://(jp.)?archive.ubuntu.com/ubuntu/@https://ftp.udx.icscoe.jp/Linux/ubuntu/@g' /etc/apt/sources.list
 apt-get update
 apt-get install -y \
+    autopoint \
+    bc \
     build-essential \
     clang \
+    cmake \
     curl \
+    gettext \
+    git \
+    git-lfs \
+    gperf \
     libtool \
+    lzip \
     make \
+    meson \
     mingw-w64 \
     mingw-w64-tools \
     nasm \
     p7zip \
     pkg-config \
+    python3 \
+    ragel \
+    subversion \
+    wget \
+    xxd \
     yasm
 EOT
 
-# ffmpeg-library-build image
-COPY --from=ffmpeg-library-build / /
+# ffmpeg-library image
+COPY --from=ffmpeg-library / /
 
-ENV TARGET_OS=${TARGET_OS} \
+# Environment
+ARG FFMPEG_VERSION
+ENV FFMPEG_VERSION="${FFMPEG_VERSION}" \
     PREFIX="/usr/local" \
     LDFLAGS="-L${PREFIX}/cuda/lib64" \
     CFLAGS="-I${PREFIX}/cuda/include" \
+    ARTIFACT_DIR="/dist" \
+    RUNTIME_LIB_DIR="/runtime" \
     WORKDIR="/workdir"
-
 WORKDIR ${WORKDIR}
 
 # Copy build script
 ADD ./scripts/*.sh ./
 
+#
+# ffmpeg build stage
+#
+FROM cuda-build-env AS ffmpeg-build
+
 
 #
 # Audio
@@ -54,10 +85,10 @@ ADD ./scripts/*.sh ./
 ENV FDK_AAC_VERSION=2.0.2
 RUN <<EOT
 source ./base.sh
-download_and_unpack_file "https://download.sourceforge.net/opencore-amr/fdk-aac/fdk-aac-${FDK_AAC_VERSION}.tar.gz"
-do_configure
+git_clone "https://github.com/mstorsjo/fdk-aac.git"
+do_configure "--enable-static --disable-shared"
 do_make_and_make_install
-echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-libfdk-aac" > ${PREFIX}/ffmpeg_configure_options
+sed -i -e 's/$/ --enable-libfdk-aac/g' ${PREFIX}/ffmpeg_configure_options
 EOT
 
 
@@ -67,95 +98,49 @@ EOT
 
 # cuda-nvcc and libnpp
 ARG CUDA_SDK_VERSION
-ARG NVIDIA_DRIVER_VERSION=511.23
-ADD ./cuda_${CUDA_SDK_VERSION}_${NVIDIA_DRIVER_VERSION}_windows.exe /tmp/cuda_${CUDA_SDK_VERSION}_${NVIDIA_DRIVER_VERSION}_windows.exe
+# ARG NVIDIA_DRIVER_VERSION=511.23
+# ADD ./cuda_${CUDA_SDK_VERSION}_${NVIDIA_DRIVER_VERSION}_windows.exe /tmp/cuda_${CUDA_SDK_VERSION}_${NVIDIA_DRIVER_VERSION}_windows.exe
 RUN <<EOT
-if [ "${HOST_TARGET}" = "x86_64-w64-mingw32" ]; then
+if [ "${TARGET_OS}" = "Windows" ]; then
     mkdir /tmp/cuda && cd /tmp/cuda
     7zr x /tmp/cuda_${CUDA_SDK_VERSION}_${NVIDIA_DRIVER_VERSION}_windows.exe
     rm /usr/local/cuda/include/npp*
     rm /usr/local/cuda/lib64/libnpp*
     cp -r libnpp/npp_dev/include ${PREFIX}
     cp libnpp/npp_dev/lib/x64/* ${PREFIX}/lib/
-    echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-cuda-nvcc" > ${PREFIX}/ffmpeg_configure_options
+    sed -i -e 's/$/ --enable-cuda-nvcc --enable-libnpp/g' ${PREFIX}/ffmpeg_configure_options
 else
-    echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-cuda-nvcc --enable-libnpp" > ${PREFIX}/ffmpeg_configure_options
-fi
-echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --nvccflags='-gencode arch=compute_52,code=sm_52'" > ${PREFIX}/ffmpeg_configure_options
-EOT
-
-# Build libmfx
-ADD https://github.com/lu-zero/mfx_dispatch/archive/master.tar.gz /tmp/mfx_dispatch-master.tar.gz
-RUN <<EOT
-if [ "${HOST_TARGET}" = "x86_64-w64-mingw32" ]; then
-    source ./base.sh
-    download_and_unpack_file "https://github.com/lu-zero/mfx_dispatch/archive/master.tar.gz"
-    do_configure
-    do_make_and_make_install
-    echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-libmfx" > ${PREFIX}/ffmpeg_configure_options
-fi
-EOT
-
-# Install MediaSDK
-ENV INTEL_MEDIA_SDK_VERSION=21.3.5
-RUN <<EOT
-if [ "${HOST_TARGET}" != "x86_64-w64-mingw32" ]; then
-    apt-get install -y libdrm2 libxext6 libxfixes3
-    source ./base.sh
-    download_and_unpack_file "https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-${INTEL_MEDIA_SDK_VERSION}/MediaStack.tar.gz"
-    cd opt/intel/mediasdk
-    cp --archive --no-dereference include ${PREFIX}/
-    cp --archive --no-dereference lib64/. ${PREFIX}/lib/
-    ldconfig
-    echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-libmfx --enable-vaapi" > ${PREFIX}/ffmpeg_configure_options
-fi
-EOT
-
-
-# Other hwaccel
-RUN <<EOT
-if [ "${HOST_TARGET}" = "x86_64-w64-mingw32" ]; then
-    echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-d3d11va --enable-dxva2" > ${PREFIX}/ffmpeg_configure_options
-fi
-EOT
-
-# Remove dynamic dll
-RUN <<EOT
-if [ "${HOST_TARGET}" = "x86_64-w64-mingw32" ]; then
-    rm /usr/x86_64-w64-mingw32/lib/libpthread.dll.a
-    rm /usr/lib/gcc/x86_64-w64-mingw32/*/libstdc++.dll.a
+    sed -i -e 's/$/ --enable-cuda-nvcc --enable-libnpp/g' ${PREFIX}/ffmpeg_configure_options
 fi
+    sed -i -e 's/$/ --nvccflags="-gencode arch=compute_52,code=sm_52"/g' ${PREFIX}/ffmpeg_configure_options
 EOT
 
-# Other hwaccel
-RUN echo -n "`cat ${PREFIX}/ffmpeg_configure_options` --enable-d3d11va --enable-dxva2" > ${PREFIX}/ffmpeg_configure_options
-
 
 #
 # Build ffmpeg
 #
-ARG FFMPEG_VERSION=5.0.1
-ENV FFMPEG_VERSION="${FFMPEG_VERSION}"
 
 # Run build
 RUN bash ./build-ffmpeg.sh
 
+# Copy run.sh
+COPY --chmod=755 <<'EOT' ${ARTIFACT_DIR}/${PREFIX}/run.sh
+#!/bin/sh
+export PATH=$(dirname $0)/bin:$PATH
+export LD_LIBRARY_PATH=$(dirname $0)/lib:$LD_LIBRARY_PATH
+export LIBVA_DRIVERS_PATH=$(dirname $0)/lib/dri
+export LIBVA_DRIVER_NAME=iHD
+exec $@
+EOT
+
+
 # Copy artifacts
 RUN <<EOT
 mkdir /build
 if [ "${HOST_TARGET}" = "x86_64-w64-mingw32" ]; then
     cp ${PREFIX}/bin/ff* /build/
     cp /tmp/cuda/libnpp/npp/bin/*.dll /build/
 else
-    cat <<'EOS' > ${PREFIX}/run.sh
-#!/bin/sh
-export PATH=$(dirname $0)/bin:$PATH
-export LD_LIBRARY_PATH=$(dirname $0)/lib:$LD_LIBRARY_PATH
-export LIBVA_DRIVERS_PATH=$(dirname $0)/lib
-export LIBVA_DRIVER_NAME=iHD
-exec $@
-EOS
-    chmod +x ${PREFIX}/run.sh
     cp --archive --parents --no-dereference ${PREFIX}/run.sh /build
     cp --archive --parents --no-dereference ${PREFIX}/bin/ff* /build
     cp --archive --parents --no-dereference ${PREFIX}/configure_options /build
@@ -174,4 +159,4 @@ EOT
 # Final ffmpeg image
 FROM scratch AS ffmpeg
 
-COPY --from=ffmpeg-build /build /
+COPY --from=ffmpeg-build /dist /
diff --git a/scripts/base.sh b/scripts/base.sh
@@ -148,6 +148,26 @@ download_and_unpack_file () {
   cd ${output_dir}
 }
 
+get_latest_version() {
+  local url=$1
+  local prefix=$2
+  local major_version="${3:-""}"
+
+  if [ -n "${major_version}" ]; then
+    local url="${url}/${major_version}"
+  fi
+
+  local version_pattern="${prefix}\K[0-9]+(\.[0-9]+)+"
+
+  local html_content=$(curl -sL "$url")
+
+  local latest_version=$(echo "$html_content" | \
+      grep -oP $version_pattern | \
+      sort -V | tail -n1)
+
+  echo "$latest_version"
+}
+
 git_clone() {
   cd ${WORKDIR}
   local repo_url="$1"
@@ -166,6 +186,19 @@ git_clone() {
   cd ${to_dir}
 }
 
+get_latest_tag() {
+  local repo_url=$1
+  local prefix="${2:-""}"
+
+  local version_pattern="^${prefix}\K[0-9]+(\.[0-9]+)+$"
+
+  latest_tag=$(git ls-remote --tags "$repo_url" | awk -F/ '{print $NF}' | \
+      grep -oP "$version_pattern" | \
+      sort -V | tail -n1)
+
+  echo "$latest_tag"
+}
+
 svn_checkout() {
   cd ${WORKDIR}
   local repo_url="$1"
@@ -240,3 +273,10 @@ gen_implib () {
 
   popd
 }
+
+do_strip () {
+  local target_dir="$1"
+  local file_pattern="$2"
+
+  find ${target_dir} -type f -name ${file_pattern} -executable -exec strip --strip-debug {} \;
+}
diff --git a/scripts/build-ffmpeg.sh b/scripts/build-ffmpeg.sh
@@ -4,10 +4,11 @@ source ./base.sh
 mkdir -p ${ARTIFACT_DIR}
 
 # Build ffmpeg
-FFMPEG_VERSION="${FFMPEG_VERSION:-"6.0"}"
+FFMPEG_VERSION="${FFMPEG_VERSION:-"7.0.2"}"
 git_clone "https://github.com/FFmpeg/FFmpeg.git" n${FFMPEG_VERSION}
 
 FFMPEG_LIBVPL_SUPPORT_VERSION="6.0"
+# Check if the current FFMPEG_VERSION is greater than to the version that supports libvpl.
 if [ "${FFMPEG_VERSION}" != "${FFMPEG_LIBVPL_SUPPORT_VERSION}" ]; then
   if [ "$(echo -e "${FFMPEG_VERSION}\n${FFMPEG_LIBVPL_SUPPORT_VERSION}" | sort -Vr | head -n 1)" == "${FFMPEG_LIBVPL_SUPPORT_VERSION}" ]; then
     sed -i -e "s/libvpl/libmfx/g" ${PREFIX}/ffmpeg_configure_options
@@ -55,6 +56,7 @@ esac
 
 # Build
 do_make_and_make_install
+do_strip ${PREFIX}/bin "ff*"
 
 
 #
diff --git a/scripts/build-library.sh b/scripts/build-library.sh
