image 'ffmpeg-7.1-ubuntu2404' is working again

CONTRIBUTING.md

@@ -49,7 +49,68 @@ docker build -t my-build docker-images/VERSION/
 find ffmpeg/ -name Dockerfile | xargs dirname | parallel --no-notice -j 4 --results logs docker build -t {} {}
 ```
 
+<details><summary>Some detailed examples, of building and running</summary>
 
+If you are not running the amd64 platform, you may need to pass in the --platform flag to build with docker desktop
+- 7.1-ubuntu2404
+
+```sh
+$ ./update.py; time docker build --no-cache --platform linux/amd64 -t ffmpeg-7.1-ubuntu2404-desktop-build docker-images/7.1/ubuntu2404
+$ docker run -it --rm --entrypoint='bash' --platform="linux/amd64" ffmpeg-7.1-ubuntu2404-desktop-build:latest
+```
+
+- 7.1-ubuntu2404-edge
+
+```sh
+$ ./update.py; time docker build --no-cache --platform linux/amd64 -t ffmpeg-7.1-ubuntu2404-edge-desktop-build docker-images/7.1/ubuntu2404-edge
+$ docker run -it --rm --entrypoint='bash' --platform="linux/amd64" ffmpeg-7.1-ubuntu2404-edge-desktop-build:latest
+```
+
+-  7.1-nvidia2204 ( the older LTS one )
+
+```sh
+$ ./update.py; time docker build --no-cache --platform linux/amd64 -t ffmpeg-7.1-nvidia2204-desktop-build docker-images/7.1/nvidia2204
+```
+
+- 7.1-nvidia2404
+
+```sh
+$ ./update.py; time docker build --no-cache --platform linux/amd64 -t ffmpeg-7.1-nvidia2404-desktop-build docker-images/7.1/nvidia2404
+```
+```sh
+$ ./update.py; docker build --no-cache --platform linux/amd64 -t ffmpeg-5.1-alpine320-desktop-build docker-images/5.1/alpine320
+$ ./update.py; time docker build --no-cache --platform linux/amd64 -t ffmpeg-7.1-scratch320-desktop-build docker-images/7.1/scratch320
+$ ./update.py; time docker build --no-cache --platform linux/amd64 -t ffmpeg-6.1-scratch320-desktop-build docker-images/6.1/scratch320
+```
+
+</details>
+
+<details><summary>More testing notes</summary>
+
+
+```
+1: simply run the image: which should output the ffmpeg help
+`docker run -it --rm --platform="linux/amd64" ffmpeg-7.1-ubuntu2404-desktop-build:latest`
+
+2: now run the image in bash
+`docker run -it --rm --entrypoint=bash --platform="linux/amd64" ffmpeg-7.1-ubuntu2404-desktop-build:latest`
+
+In the bash shell, run the following commands
+   $ ffmpeg
+   $ ffmpeg -h
+   $ ldd `which ffmpeg`
+   $ for i in ogg amr vorbis theora mp3lame opus vpx xvid fdk x264 x265;do echo $i; find /usr/local/ -name *$i*;done
+   $ ffmpeg -buildconf
+
+3: Convert an avi file to an mp4 file.
+   `docker run --rm -v $(pwd):$(pwd) -w $(pwd) --platform="linux/amd64" ffmpeg-7.1-ubuntu2404-desktop-build:latest -i drop_video_1.avi outfile/dv_converted.mp4`
+
+4: Convert a asf file to an mp4
+   `docker run --rm -v $(pwd):$(pwd) -w $(pwd) --platform="linux/amd64" ffmpeg-7.1-ubuntu2404-desktop-build:latest -i MU_2_Discharge_Bottle___Inlet_to_Discharge.asf outfile/mpu2_discharge_bottle_converted.mp4`
+
+```
+
+</details>
 
 # Reviewing
 

README.md

@@ -23,16 +23,18 @@ Below is a table that provides examples for the nomenclature:
 
 | image name | OS ver | ffmpeg ver | variant | description
 | --- | --- | --- | --- | --- |
-| ffmpeg-7.1-ubuntu2404 | 24.04 | 7.1 | [ubuntu](https://releases.ubuntu.com/) | external libraries are installed from os packages, and ffmpeg is built from source. See [Ubunu Compilation Guide](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu) for details on this. |
-| ffmpeg-7.0-ubuntu2404-edge | 24.04 | 7.0 | [ubuntu](https://releases.ubuntu.com/) | libs and ffmpeg are built from source. See [Ubunu Compilation Guide](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu) for details on this. |
-| ffmpeg-6.1-vaapi2404 | 24.04 | 6.1 | [ubuntu](https://releases.ubuntu.com/) | like: `ubuntu2404` but enables: [Video Acceleration API (VAAPI)](https://trac.ffmpeg.org/wiki/HWAccelIntro#VAAPI) in ffmpeg |
-| ffmpeg-5.1-nvidia2204-edge | 22.04 | 5.1 | [ubuntu](https://releases.ubuntu.com/) | Built w/ [NVIDIA's hardware-accelerated encoding and decoding APIs](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC) enabled |
-| ffmpeg-7.1-alpine320 | 3.20 | 7.1 | [alpine](https://alpinelinux.org/releases/) | vendor libs, but ffmpeg is built from source |
-| ffmpeg-7.0-scratch | 3.20 | 7.0 | [alpine](https://alpinelinux.org/releases/) | vendor libs, and ffmpeg are built from source. Also we make the distro as small as possible by not installing any packages in base and striping symbols of installed libs |
+| ffmpeg-7.1-ubuntu2404 | 24.04 | 5.x - 7.x | [ubuntu](https://releases.ubuntu.com/) | external libraries are installed from os packages, and ffmpeg is built from source. See [Ubunu Compilation Guide](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu) for details on this. |
+| ffmpeg-7.0-ubuntu2404-edge | 24.04 | 5.x - 7.x | [ubuntu](https://releases.ubuntu.com/) | libs and ffmpeg are built from source. See [Ubunu Compilation Guide](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu) for details on this. |
+| ffmpeg-7.0-ubuntu2404-debug | 24.04 | 5.x - 7.x | [ubuntu](https://releases.ubuntu.com/) | Developer only build, disabled when checked in. This will make a large container with all of the source built, if something fails the docker image still builds |
+|
+| ffmpeg-6.1-vaapi2404 | 24.04 | 5.x - 7.x | [ubuntu](https://releases.ubuntu.com/) | like: `ubuntu2404` but enables: [Video Acceleration API (VAAPI)](https://trac.ffmpeg.org/wiki/HWAccelIntro#VAAPI) in ffmpeg |
+| ffmpeg-5.1-nvidia2204-edge | 22.04 | 5.x - 7.x | [ubuntu](https://releases.ubuntu.com/) | Built w/ [NVIDIA's hardware-accelerated encoding and decoding APIs](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC) enabled |
+| ffmpeg-7.1-alpine320 | 3.20 | 5.x - 7.x | [alpine](https://alpinelinux.org/releases/) | vendor libs, but ffmpeg is built from source |
+| ffmpeg-7.0-scratch | 3.20 | 5.x - 7.x | [alpine](https://alpinelinux.org/releases/) | vendor libs, and ffmpeg are built from source. Also we make the distro as small as possible by not installing any packages in base and striping symbols of installed libs |
 
 ffmpeg `<version>` can be one of the following: `5.1`, `6.1`, `7.0`, `7.1` with the above table.
 
-Note: I changed the ffmpeg version number in the table above as an example of how this works. Probably best to stick with the latest ffmpeg.
+Note: The current versions of ffmpeg supported are  anything newer than 3 years old and not exceeded the end-of-life
 
 
 <details><summary>Here are some additional older builds</summary>

build_source.sh

@@ -1,32 +1,14 @@
 #!/usr/bin/env bash
 
-manifestJsonFile="/tmp/workdir/generated_build_manifest.json"
-manifestJsonVersionsFile="/tmp/workdir/generated_build_manifest_versions.json"
+# Stop execution on any error
+# Note: we can override this in the Dockerfile RUN command with an || true.
+#       this is useful for debugging
+set -e
 
-extract_tarball() {
-    local tarball_name=$1
-    # grab the extension of the tarball
-    local extension="${tarball_name##*.}"
-    # tar extraction args: -z, -j, -J, --lzma  Compress archive with gzip/bzip2/xz/lzma
-    if [ "$extension" == "gz" ]; then
-        tar -zx --strip-components=1 -f ${tarball_name}
-    elif [ "$extension" == "bz2" ]; then
-        tar -jx --strip-components=1 -f ${tarball_name}
-    elif [ "$extension" == "zx" ]; then
-        tar -Jx --strip-components=1 -f ${tarball_name}
-    else
-        echo "Error while extract_tarball, got an unknown extension: $extension"
-    fi
-}
-
-# read_data_from_manifest() {
-#     local lib_name=$1
-#     local data=$(jq -r '.[] | select(.library_name == "'$lib_name'")' $manifestJsonFile)
-#     local build_dir=$(echo "$data" | jq -r '.build_dir')
-#     local tarball_name=$(echo "$data" | jq -r '.tarball_name')
-#     echo "$build_dir $tarball_name"
-# }
+manifestJsonFile="/tmp/workdir/generated_build_manifest.json"
+manifestJsonVersionsFile="/tmp/workdir/generated_build_versions_manifest.json"
 
+######################### Callback build functions #########################
 build_libopencore-amr() {
     ./configure --prefix="${PREFIX}" --enable-shared && \
     make && \
@@ -42,13 +24,9 @@ build_libx264() {
 build_libx265() {
     cd build/linux && \
     sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \
-    sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \
+    sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh
     ./multilib.sh && \
-    make -C 8bit install && \
-    rm -rf ${DIR}
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DENABLE_SHARED=on -DENABLE_PIC=on . && \
-    make && \
-    make install
+    make -C 8bit install
 }
 
 build_libogg() {
@@ -71,7 +49,7 @@ build_libvorbis() {
 
 build_libvpx() {
     ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \
-    --disable-debug --disable-examples --disable-docs --disable-install-bins  && \
+        --disable-debug --disable-examples --disable-docs --disable-install-bins && \
     make && \
     make install
 }
@@ -96,7 +74,7 @@ build_libxvid() {
 
 build_libfdk-aac() {
     autoreconf -fiv && \
-    ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \
+    ./configure --prefix="${PREFIX}" --disable-shared && \
     make && \
     make install
 }
@@ -141,29 +119,38 @@ build_libass() {
 }
 
 build_kvazaar() {
-    ./autogen.sh && \
+    # ./autogen.sh && \
     ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \
     make && \
     make install
 }
 
 # aom is a git clone ( to get source, so not in the loop using the callback function)
-build_aom(){
-    local dir = "/tmp/aom"
+build_aom() {
+    local data=$(jq -r '.[] | select(.library_name == "aom")' $manifestJsonFile)
+    local dir=$(echo "$data" | jq -r '.build_dir')
     local aom_version=$(jq -r '.["aom"]' $manifestJsonVersionsFile)  # Access value with key "aom"
-    echo "Building aom-${aom_version}"
-    git clone --branch ${aom_version} --depth 1 https://aomedia.googlesource.com/aom ${dir} ; \
-    cd ${dir} ; \
-    mkdir -p ./aom_build ; \
-    cd ./aom_build ; \
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 -DENABLE_NASM=on ..; \
+    if [ -n "$aom_version" ] && [[ "$aom_version" != "null" ]]; then
+        echo "Building [aom-${aom_version}] in [${dir}]"
+    else
+        echo "Error: aom version is empty or unset"
+        if [[ "$continue_on_build_failure" == false ]]; then
+            exit 1
+        fi
+    fi
+    version="v${aom_version}"
+    git clone --branch ${version} --depth 1 https://aomedia.googlesource.com/aom ${dir} && \
+    cd ${dir} && \
+    mkdir -p ./aom_build && \
+    cd ./aom_build && \
+    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 -DENABLE_NASM=on .. && \
     make && \
     make install
 }
 
 build_libsvtav1() {
     cd Build && \
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}"  -DCMAKE_BUILD_TYPE=Release -DBUILD_DEC=OFF -DBUILD_SHARED_LIBS=OFF ..; \
+    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_BUILD_TYPE=Release -DBUILD_DEC=OFF -DBUILD_SHARED_LIBS=OFF .. \
     make && \
     make install
 }
@@ -214,14 +201,13 @@ build_libzmq() {
     ./autogen.sh && \
     ./configure --prefix="${PREFIX}" && \
     make && \
-    make check && \
     make install
 }
 
 # another special, code clone situation ( actually currently using the tarball build approach )
 build_libpng() {
     local dir = "/tmp/png"
-    local libpng_version=$(jq -r '.["libpng"]' $manifestJsonVersionsFile)  # Access value with key "libpng"
+    # local libpng_version=$(jq -r '.["libpng"]' $manifestJsonVersionsFile)  # Access value with key "libpng"
     # git clone https://git.code.sf.net/p/libpng/code ${dir} -b v${libpng_version} --depth 1 && \
     ./autogen.sh && \
     ./configure --prefix="${PREFIX}" && \
@@ -265,12 +251,33 @@ build_libsrt() {
 build_libvmaf() {
     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 --buildtype=release --default-library=static --prefix "${PREFIX}" .. && \
     ninja && \
     ninja install
 }
 
 build_ffmpeg() {
+    # Here is a list of things that we enable in the ffmpeg build: that are not in the
+    # track configuration guide: https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu#FFmpeg
+    # --enable-fontconfig
+    # --enable-libaribb24
+    # --enable-libbluray
+    # --enable-libkvazaar
+    # --enable-libopencore-amrnb
+    # --enable-libopencore-amrwb
+    # --enable-libopenjpeg
+    # --enable-libsrt
+    # --enable-libtheora
+    # --enable-libvmaf
+    # --enable-libwebp
+    # --enable-libxvid
+    # --enable-libzimg
+    # --enable-libzmq
+    # --enable-openssl
+    # --enable-postproc
+    # --enable-small
+    # --enable-version3
+
     # export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
     ./configure %%FFMPEG_CONFIG_FLAGS%% && \
     make && \
@@ -280,7 +287,22 @@ build_ffmpeg() {
     hash -r && \
     cd tools && \
     make qt-faststart && cp qt-faststart ${PREFIX}/bin/
-
+}
+######################### Helper functions #########################
+extract_tarball() {
+    local tarball_name=$1
+    # grab the extension of the tarball
+    local extension="${tarball_name##*.}"
+    # tar extraction args: -z, -j, -J, --lzma  Compress archive with gzip/bzip2/xz/lzma
+    if [ "$extension" == "gz" ]; then
+        tar -zx --strip-components=1 -f ${tarball_name}
+    elif [ "$extension" == "bz2" ]; then
+        tar -jx --strip-components=1 -f ${tarball_name}
+    elif [ "$extension" == "zx" ]; then
+        tar -Jx --strip-components=1 -f ${tarball_name}
+    else
+        echo "Error while extract_tarball, got an unknown extension: $extension"
+    fi
 }
 
 
@@ -291,6 +313,7 @@ build_support_libraries() {
         lib_name=${libs[$i]}
         # handle the clone source case's ( there are only two )
         if [ "$lib_name" == "libsvtav1" ]; then
+            echo "-------------------- Running callback: build_aom --------------------"
             echo "Building 'aom' before we build $lib_name"
             build_aom
         fi
@@ -304,7 +327,7 @@ build_support_libraries() {
         tarball_name=$(echo "$data" | jq -r '.tarball_name')
         sha256sum=$(echo "$data" | jq -r '.sha256sum')
 
-        echo "Building $lib_name: in [${build_dir}] from [$tarball_name] source"
+        echo "Building $lib_name: from ${build_dir}/$tarball_name]"
         cd $build_dir
         extract_tarball $tarball_name
         if [ -n "$sha256sum" ] && [[ "$sha256sum" != "null" ]]; then
@@ -313,6 +336,7 @@ build_support_libraries() {
         fi
         # make a callback function to build the library
         # if anything fails, we will exit with a non-zero status
+        echo "-------------------- Running callback: build_${lib_name} --------------------"
         build_${lib_name} ${build_dir}
     done
 }