ffmpeg 6.0 (#6)

* vaapi: use standard ffmpeg 6; include dav1d * update to ffmpeg 6, include dav1d
2023-03-01 14:44:59 -06:00
parent fac4c38a98
commit 58c86c89a0
6 changed files with 104 additions and 25 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -60,7 +60,7 @@ jobs:
          file: ./${{ matrix.path }}Dockerfile
          push: true
          tags: |
-            jasongdove/ersatztv-ffmpeg:5.1.2${{ matrix.suffix }}
+            jasongdove/ersatztv-ffmpeg:6.0${{ matrix.suffix }}
        if: ${{ matrix.name != 'arm64' && matrix.name != 'arm32v7' }}

      - name: Build and push
@@ -72,7 +72,7 @@ jobs:
          push: true
          platforms: 'linux/arm64'
          tags: |
-            jasongdove/ersatztv-ffmpeg:5.1.2${{ matrix.suffix }}
+            jasongdove/ersatztv-ffmpeg:6.0${{ matrix.suffix }}
        if: ${{ matrix.name == 'arm64' }}

      - name: Build and push
@@ -84,5 +84,5 @@ jobs:
          push: true
          platforms: 'linux/arm/v7'
          tags: |
-            jasongdove/ersatztv-ffmpeg:5.1.2${{ matrix.suffix }}
+            jasongdove/ersatztv-ffmpeg:6.0${{ matrix.suffix }}
        if: ${{ matrix.name == 'arm32v7' }}
--- a/15
+++ b/15
@@ -5,13 +5,14 @@ ENV MAKEFLAGS="-j4"

 ENV AOM=v1.0.0 \
    FDKAAC=2.0.1 \
-    FFMPEG_HARD=5.1.2 \
+    FFMPEG_HARD=6.0 \
    FONTCONFIG=2.13.92 \
    FREETYPE=2.10.4 \
    FRIBIDI=1.0.8 \
    KVAZAAR=2.0.0 \
    LAME=3.100 \
    LIBASS=0.14.0 \
+    LIBDAV1D=1.1.0 \
    LIBDRM=2.4.100 \
    LIBSRT=1.4.1 \
    LIBVIDSTAB=1.1.0 \
@@ -88,6 +89,17 @@ RUN cd /tmp/aom && \
    make && \
    make install

+# dav1d
+RUN mkdir -p /tmp/dav1d && \
+    git clone \
+    --branch ${LIBDAV1D} \
+    --depth 1 https://github.com/videolan/dav1d.git \
+    /tmp/dav1d
+RUN mkdir /tmp/dav1d/build && cd /tmp/dav1d/build && \
+    meson setup -Denable_tools=false -Denable_tests=false --libdir /usr/local/lib .. && \
+    ninja && \
+    ninja install
+
 # fdk-aac
 RUN mkdir -p /tmp/fdk-aac && \
    curl -Lf \
@@ -390,6 +402,7 @@ RUN cd /tmp/ffmpeg && \
    --enable-fontconfig \
    --enable-gpl \
    --enable-libaom \
+    --enable-libdav1d \
    --enable-libass \
    --enable-libfdk_aac \
    --enable-libfreetype \
--- a/arm32v7.Dockerfile
+++ b/arm32v7.Dockerfile
@@ -5,13 +5,14 @@ ENV MAKEFLAGS="-j4"

 ENV AOM=v1.0.0 \
    FDKAAC=2.0.1 \
-    FFMPEG_HARD=5.1.2 \
+    FFMPEG_HARD=6.0 \
    FONTCONFIG=2.13.92 \
    FREETYPE=2.10.4 \
    FRIBIDI=1.0.8 \
    KVAZAAR=2.0.0 \
    LAME=3.100 \
    LIBASS=0.14.0 \
+    LIBDAV1D=1.1.0 \
    LIBSRT=1.4.1 \
    LIBVIDSTAB=1.1.0 \
    LIBWEBP=1.0.2 \
@@ -52,16 +53,21 @@ RUN apt-get -yqq update && \
    libxml2-dev \
    make \
    nasm \
+    ninja-build \
    patch \
    perl \
    pkg-config \
-    python2 \
+    python3 \
+    python3-pip\
+    python3-setuptools \
+    python3-wheel \
    x11proto-xext-dev \
    xserver-xorg-dev \
    yasm \
    zlib1g-dev && \
    apt-get autoremove -y && \
-    apt-get clean -y
+    apt-get clean -y && \
+    pip3 install meson

 # aom
 RUN mkdir -p /tmp/aom && \
@@ -82,6 +88,17 @@ RUN cd /tmp/aom && \
    make && \
    make install

+# dav1d
+RUN mkdir -p /tmp/dav1d && \
+    git clone \
+    --branch ${LIBDAV1D} \
+    --depth 1 https://github.com/videolan/dav1d.git \
+    /tmp/dav1d
+RUN mkdir /tmp/dav1d/build && cd /tmp/dav1d/build && \
+    meson setup -Denable_tools=false -Denable_tests=false --libdir /usr/local/lib .. && \
+    ninja && \
+    ninja install
+
 # fdk-aac
 RUN mkdir -p /tmp/fdk-aac && \
    curl -Lf \
@@ -382,6 +399,7 @@ RUN cd /tmp/ffmpeg && \
    --enable-fontconfig \
    --enable-gpl \
    --enable-libaom \
+    --enable-libdav1d \
    --enable-libass \
    --enable-libfdk_aac \
    --enable-libfreetype \
--- a/arm64.Dockerfile
+++ b/arm64.Dockerfile
@@ -5,13 +5,14 @@ ENV MAKEFLAGS="-j4"

 ENV AOM=v1.0.0 \
    FDKAAC=2.0.1 \
-    FFMPEG_HARD=5.1.2 \
+    FFMPEG_HARD=6.0 \
    FONTCONFIG=2.13.92 \
    FREETYPE=2.10.4 \
    FRIBIDI=1.0.8 \
    KVAZAAR=2.0.0 \
    LAME=3.100 \
    LIBASS=0.14.0 \
+    LIBDAV1D=1.1.0 \
    LIBSRT=1.4.1 \
    LIBVIDSTAB=1.1.0 \
    LIBWEBP=1.0.2 \
@@ -52,16 +53,21 @@ RUN apt-get -yqq update && \
    libxml2-dev \
    make \
    nasm \
+    ninja-build \
    patch \
    perl \
    pkg-config \
-    python2 \
+    python3 \
+    python3-pip\
+    python3-setuptools \
+    python3-wheel \
    x11proto-xext-dev \
    xserver-xorg-dev \
    yasm \
    zlib1g-dev && \
    apt-get autoremove -y && \
-    apt-get clean -y
+    apt-get clean -y && \
+    pip3 install meson

 # aom
 RUN mkdir -p /tmp/aom && \
@@ -81,6 +87,17 @@ RUN cd /tmp/aom && \
    make && \
    make install

+# dav1d
+RUN mkdir -p /tmp/dav1d && \
+    git clone \
+    --branch ${LIBDAV1D} \
+    --depth 1 https://github.com/videolan/dav1d.git \
+    /tmp/dav1d
+RUN mkdir /tmp/dav1d/build && cd /tmp/dav1d/build && \
+    meson setup -Denable_tools=false -Denable_tests=false --libdir /usr/local/lib .. && \
+    ninja && \
+    ninja install
+
 # fdk-aac
 RUN mkdir -p /tmp/fdk-aac && \
    curl -Lf \
@@ -372,6 +389,7 @@ RUN cd /tmp/ffmpeg && \
    --enable-fontconfig \
    --enable-gpl \
    --enable-libaom \
+    --enable-libdav1d \
    --enable-libass \
    --enable-libfdk_aac \
    --enable-libfreetype \
--- a/nvidia.Dockerfile
+++ b/nvidia.Dockerfile
@@ -5,13 +5,14 @@ ENV MAKEFLAGS="-j4"

 ENV AOM=v1.0.0 \
    FDKAAC=2.0.1 \
-    FFMPEG_HARD=5.1.2 \
+    FFMPEG_HARD=6.0 \
    FONTCONFIG=2.13.92 \
    FREETYPE=2.10.4 \
    FRIBIDI=1.0.8 \
    KVAZAAR=2.0.0 \
    LAME=3.100 \
    LIBASS=0.14.0 \
+    LIBDAV1D=1.1.0 \
    LIBDRM=2.4.100 \
    LIBSRT=1.4.1 \
    LIBVA=2.17.0 \
@@ -19,7 +20,7 @@ ENV AOM=v1.0.0 \
    LIBVIDSTAB=1.1.0 \
    LIBVMAF=master \
    LIBWEBP=1.0.2 \
-    NVCODEC=11.1.5.0 \
+    NVCODEC=11.1.5.2 \
    OGG=1.3.4 \
    OPENCOREAMR=0.1.5 \
    OPENJPEG=2.3.1 \
@@ -94,6 +95,17 @@ RUN cd /tmp/aom && \
    make && \
    make install

+# dav1d
+RUN mkdir -p /tmp/dav1d && \
+    git clone \
+    --branch ${LIBDAV1D} \
+    --depth 1 https://github.com/videolan/dav1d.git \
+    /tmp/dav1d
+RUN mkdir /tmp/dav1d/build && cd /tmp/dav1d/build && \
+    meson setup -Denable_tools=false -Denable_tests=false --libdir /usr/local/lib .. && \
+    ninja && \
+    ninja install
+
 # fdk-aac
 RUN mkdir -p /tmp/fdk-aac && \
    curl -Lf \
@@ -446,6 +458,7 @@ RUN cd /tmp/ffmpeg && \
    --enable-fontconfig \
    --enable-gpl \
    --enable-libaom \
+    --enable-libdav1d \
    --enable-libass \
    --enable-libfdk_aac \
    --enable-libfreetype \
--- a/vaapi.Dockerfile
+++ b/vaapi.Dockerfile
@@ -6,13 +6,14 @@ ENV MAKEFLAGS="-j4"
 ARG LIBVA=2.17.0
 ENV AOM=v1.0.0 \
    FDKAAC=2.0.1 \
-    FFMPEG_HARD=5.1.2 \
+    FFMPEG_HARD=6.0 \
    FONTCONFIG=2.13.92 \
    FREETYPE=2.10.4 \
    FRIBIDI=1.0.8 \
    KVAZAAR=2.0.0 \
    LAME=3.100 \
    LIBASS=0.14.0 \
+    LIBDAV1D=1.1.0 \
    LIBDRM=2.4.100 \
    LIBSRT=1.4.1 \
    LIBVA=$LIBVA \
@@ -109,6 +110,17 @@ RUN cd /tmp/aom && \
    make && \
    make install

+# dav1d
+RUN mkdir -p /tmp/dav1d && \
+    git clone \
+    --branch ${LIBDAV1D} \
+    --depth 1 https://github.com/videolan/dav1d.git \
+    /tmp/dav1d
+RUN mkdir /tmp/dav1d/build && cd /tmp/dav1d/build && \
+    meson setup -Denable_tools=false -Denable_tests=false --libdir /usr/local/lib .. && \
+    ninja && \
+    ninja install
+
 # fdk-aac
 RUN mkdir -p /tmp/fdk-aac && \
    curl -Lf \
@@ -419,14 +431,17 @@ RUN cd /tmp/xvid/build/generic && \
    make install

 # ffmpeg
-RUN cd /tmp && \
-    git clone https://github.com/intel/cartwheel-ffmpeg --recursive && \
-    cd cartwheel-ffmpeg && \
-    git submodule update --init --recursive && \
-    cd ffmpeg && \
-    git config user.name "ersatztv" && git config user.email "ersatztv@ersatztv.org" && \
-    git am ../patches/*.patch
-RUN cd /tmp/cartwheel-ffmpeg/ffmpeg && \
+RUN if [ -z ${FFMPEG_VERSION+x} ]; then \
+    FFMPEG=${FFMPEG_HARD}; \
+    else \
+    FFMPEG=${FFMPEG_VERSION}; \
+    fi && \
+    mkdir -p /tmp/ffmpeg && \
+    echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
+    curl -Lf \
+    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/ffmpeg
+RUN cd /tmp/ffmpeg && \
    ./configure \
    --disable-debug \
    --disable-doc \
@@ -435,6 +450,7 @@ RUN cd /tmp/cartwheel-ffmpeg/ffmpeg && \
    --enable-fontconfig \
    --enable-gpl \
    --enable-libaom \
+    --enable-libdav1d \
    --enable-libass \
    --enable-libfdk_aac \
    --enable-libfreetype \
@@ -473,12 +489,12 @@ RUN ldconfig && \
    /buildout/usr/local/bin \
    /buildout/usr/lib && \
    cp \
-    /tmp/cartwheel-ffmpeg/ffmpeg/ffmpeg \
+    /tmp/ffmpeg/ffmpeg \
    /buildout/usr/local/bin && \
    cp \
-    /tmp/cartwheel-ffmpeg/ffmpeg/ffprobe \
+    /tmp/ffmpeg/ffprobe \
    /buildout/usr/local/bin && \
-    ldd /tmp/cartwheel-ffmpeg/ffmpeg/ffmpeg \
+    ldd /tmp/ffmpeg/ffmpeg \
    | awk '/local/ {print $3}' \
    | xargs -i cp -L {} /buildout/usr/lib/ && \
    cp -a \
@@ -491,7 +507,8 @@ FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as runtime-base
 ENV MAKEFLAGS="-j4" \
    LIBVA_DRIVERS_PATH="/usr/lib/x86_64-linux-gnu/dri" \
    LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu" \
-    LIBVA_MESSAGING_LEVEL=0
+    LIBVA_MESSAGING_LEVEL=0 \
+    LIBVA_DISPLAY=drm

 RUN apt-get -yqq update && \
    apt-get install -yq --no-install-recommends ca-certificates expat libgomp1 libxcb-shape0 libv4l-0 \