ImageMetrics
diff --git a/‎README.md
Copy file name to clipboardExpand all lines: README.md
+13-1Lines changed: 13 additions & 1 deletion b/‎README.md
Copy file name to clipboardExpand all lines: README.md
+13-1Lines changed: 13 additions & 1 deletion
diff --git a/‎build-ffmpeg
Copy file name to clipboardExpand all lines: build-ffmpeg
+28-2Lines changed: 28 additions & 2 deletions b/‎build-ffmpeg
Copy file name to clipboardExpand all lines: build-ffmpeg
+28-2Lines changed: 28 additions & 2 deletions
diff --git a/‎cuda-ubuntu.dockerfile
Copy file name to clipboardExpand all lines: cuda-ubuntu.dockerfile
+30-20Lines changed: 30 additions & 20 deletions b/‎cuda-ubuntu.dockerfile
Copy file name to clipboardExpand all lines: cuda-ubuntu.dockerfile
+30-20Lines changed: 30 additions & 20 deletions
@@ -260,6 +260,18 @@ $ ls build/lib
 libnppc.so.11 libnppicc.so.11 libnppidei.so.11 libnppig.so.11
 ```
 
+##### Notes on Docker build with CUDA
+
+If you see a "CUDA compute capability could not be found" message during build, first check to see if your GPU device is even available.  
+In addition, Docker build needs access to CUDA devices to detect your capability version. [some steps](https://stackoverflow.com/a/77348905/7764138) are required on the host machine to allow this access.  
+
+1. Install NVIDIA docker runtime and toolkit `sudo apt install nvidia-container-runtime nvidia-container-toolkit`
+2. Modify `/etc/docker/daemon.json` and add the line `"default-runtime": "nvidia"`
+3. Remove buildx: `sudo apt remove docker-buildx-plugin`
+4. Restart Docker: `sudo systemctl restart docker`
+5. (Optional but Recommended) If all this doesn't work, also disable buildkit with `export DOCKER_BUILDKIT=0` before building  
+
+
 #### Full static version
 
 If you're running an operating system other than the one above, a completely static build may work. To build a full
@@ -324,7 +336,7 @@ ffmpeg-build-script v1.xx
 
 Using 12 make jobs simultaneously.
 With GPL and non-free codecs
-
+CUDA compute capability: 75
 building giflib - version 5.2.1
 =======================
 Downloading https://netcologne.dl.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz as giflib-5.2.1.tar.gz
 
@@ -278,6 +278,18 @@ if $NONFREE_AND_GPL; then
   echo "With GPL and non-free codecs"
 fi
 
+# Check CUDA compute capability
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  if command_exists "nvcc"; then
+    export CUDA_COMPUTE_CAPABILITY=$(deviceQuery | grep Capability | head -n 1 | awk 'END {print $NF}' | tr -d '.')
+    echo "CUDA compute capability: $CUDA_COMPUTE_CAPABILITY"
+  fi
+  if [ -z "$CUDA_COMPUTE_CAPABILITY" ]; then
+    echo "CUDA compute capability could not be found... do you have CUDA access in docker?"
+    exit 1
+  fi
+fi
+
 if [ -n "$LDEXEFLAGS" ]; then
   echo "Start the build in full static mode."
 fi
@@ -847,7 +859,7 @@ fi
 ##
 
 if build "libsdl" "2.28.5"; then
-  download "https://www.libsdl.org/release/SDL2-$CURRENT_PACKAGE_VERSION.tar.gz"
+  download "https://github.com/libsdl-org/SDL/releases/download/release-$CURRENT_PACKAGE_VERSION/SDL2-$CURRENT_PACKAGE_VERSION.tar.gz"
   execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
   execute make -j $MJOBS
   execute make install
@@ -883,6 +895,20 @@ if $NONFREE_AND_GPL; then
   CONFIGURE_OPTIONS+=("--enable-libsrt")
 fi
 
+##
+## zmq library
+##
+
+if build "libzmq" "4.3.5"; then
+  download "https://github.com/zeromq/libzmq/releases/download/v$CURRENT_PACKAGE_VERSION/zeromq-$CURRENT_PACKAGE_VERSION.tar.gz"
+  execute ./autogen.sh
+  execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
+  execute make -j $MJOBS
+  execute make install
+  build_done "libzmq" $CURRENT_PACKAGE_VERSION
+  CONFIGURE_OPTIONS+=("--enable-libzmq")
+fi
+
 ##
 ## HWaccel library
 ##
@@ -904,7 +930,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
     fi
 
     # https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
-    CONFIGURE_OPTIONS+=("--nvccflags=-gencode arch=compute_52,code=sm_52")
+    CONFIGURE_OPTIONS+=("--nvccflags=-gencode arch=compute_$CUDA_COMPUTE_CAPABILITY,code=sm_$CUDA_COMPUTE_CAPABILITY")
   else
     CONFIGURE_OPTIONS+=("--disable-ffnvcodec")
   fi
 
@@ -1,31 +1,41 @@
-ARG VER=22.04
+ARG CUDAVER=12.2.2
+ARG UBUNTUVER=22.04
 
-FROM ubuntu:${VER} AS build
-
-ARG CUDAVER=11.8.0-1
+FROM nvidia/cuda:${CUDAVER}-devel-ubuntu${UBUNTUVER} as build
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 
-RUN apt-get update \
-    && apt-get -y --no-install-recommends install wget ca-certificates \
-    && update-ca-certificates \
-    && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb \
-    && dpkg -i cuda-keyring_1.0-1_all.deb \
-    && apt-get update
-
-RUN apt-get -y --no-install-recommends install build-essential curl libva-dev python3 python-is-python3 ninja-build meson cmake \
-    cuda="${CUDAVER}" \
-    && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get -y --no-install-recommends install \
+    build-essential \
+    curl \
+    libva-dev \
+    python3 \
+    python-is-python3 \
+    ninja-build \
+    meson \
+    cmake \
+    git && \
+    # clean
+    apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
+# build and move deviceQuery to /usr/bin
+RUN mkdir -p /code && \
+    git clone --depth 1 https://github.com/NVIDIA/cuda-samples.git /code/cuda-samples && \
+    cd /code/cuda-samples/Samples/1_Utilities/deviceQuery && \
+    make && \
+    mv deviceQuery /usr/local/bin
 
 WORKDIR /app
 COPY ./build-ffmpeg /app/build-ffmpeg
 
 RUN SKIPINSTALL=yes /app/build-ffmpeg --build --enable-gpl-and-non-free
 
 
-FROM ubuntu:${VER}
+FROM ubuntu:${UBUNTUVER} as release
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV NVIDIA_VISIBLE_DEVICES all
@@ -37,11 +47,11 @@ RUN apt-get update \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # Copy libnpp
-COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppc.so.11 /lib/x86_64-linux-gnu/libnppc.so.11
-COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppig.so.11 /lib/x86_64-linux-gnu/libnppig.so.11
-COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppicc.so.11 /lib/x86_64-linux-gnu/libnppicc.so.11
-COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppidei.so.11 /lib/x86_64-linux-gnu/libnppidei.so.11
-COPY --from=build /usr/local/cuda-11.8/targets/x86_64-linux/lib/libnppif.so.11 /lib/x86_64-linux-gnu/libnppif.so.11
+COPY --from=build /usr/local/cuda/targets/x86_64-linux/lib/libnppc.so /lib/x86_64-linux-gnu/libnppc.so
+COPY --from=build /usr/local/cuda/targets/x86_64-linux/lib/libnppig.so /lib/x86_64-linux-gnu/libnppig.so
+COPY --from=build /usr/local/cuda/targets/x86_64-linux/lib/libnppicc.so /lib/x86_64-linux-gnu/libnppicc.so
+COPY --from=build /usr/local/cuda/targets/x86_64-linux/lib/libnppidei.so /lib/x86_64-linux-gnu/libnppidei.so
+COPY --from=build /usr/local/cuda/targets/x86_64-linux/lib/libnppif.so /lib/x86_64-linux-gnu/libnppif.so
 
 # Copy ffmpeg
 COPY --from=build /app/workspace/bin/ffmpeg /usr/bin/ffmpeg