Merge branch 'master' into dependabot/github_actions/actions/checkout-5

Author: kylophone

.github/workflows/libvmaf.yml

@@ -25,6 +25,9 @@ jobs:
             CC: ccache clang
             CXX: ccache clang++
             experimental: true
+          - os: ubuntu-24.04-arm
+            CC: ccache clang
+            CXX: ccache clang++
     runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.CC }}
@@ -99,7 +102,7 @@ jobs:
           echo "upload_url=$(curl -L https://api.github.com/repos/${{ github.repository }}/releases/tags/$(cut -d/ -f3 <<< ${{ github.ref }}) | jq -r ."upload_url")" >> $GITHUB_OUTPUT
 
       - name: Upload vmaf
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.os }}-${{ matrix.CC }}-vmaf
           path: ${{ steps.get_info.outputs.path }}

.github/workflows/windows.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
@@ -65,7 +65,7 @@ jobs:
           echo "upload_url=$(curl -L https://api.github.com/repos/${{ github.repository }}/releases/tags/$(cut -d/ -f3 <<< ${{ github.ref }}) | jq -r ."upload_url")" >> $GITHUB_OUTPUT
 
       - name: Upload vmaf
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.msystem }}-vmaf
           path: ${{ steps.get_info.outputs.path }}

.travis.yml

@@ -1,4 +1,5 @@
 FROM ubuntu:22.04
+ARG NV_CODEC_TAG="876af32a202d0de83bd1d36fe74ee0f7fcf86b0d"
 
 # get and install building tools
 RUN apt-get update && \
@@ -10,16 +11,24 @@ RUN apt-get update && \
     python3 \
     python3-pip \
     python3-venv \
-    xxd
+    xxd \
+    clang \
+    wget \
+    unzip \
+    nvidia-cuda-dev \
+    nvidia-cuda-toolkit
 
 # retrieve source code
 COPY . /vmaf
 
 # setup environment
 ENV PATH=/vmaf:/vmaf/libvmaf/build/tools:$PATH
 
+RUN wget https://github.com/FFmpeg/nv-codec-headers/archive/${NV_CODEC_TAG}.zip && unzip ${NV_CODEC_TAG}.zip && cd nv-codec-headers-${NV_CODEC_TAG} && make && make install
+
 # make vmaf
-RUN cd /vmaf && make clean && make
+# when disabling NVCC, libvmaf will be built without cubin's which will compile kernels at start of the container
+RUN cd /vmaf && make clean && make ENABLE_NVCC=true && make install
 
 # install python tools
 RUN pip3 install --no-cache-dir -r /vmaf/python/requirements.txt

Dockerfile

@@ -0,0 +1,29 @@
+FROM vmaf
+
+RUN apt-get update && \
+    apt-get install -y pkg-config
+
+ARG FFMPEG_TAG=master
+ARG NVCC_FLAGS="-gencode arch=compute_75,code=sm_75 -gencode arch=compute_75,code=compute_75 -O2"
+
+# get ffmpeg
+RUN wget https://github.com/FFmpeg/FFmpeg/archive/${FFMPEG_TAG}.zip && unzip ${FFMPEG_TAG}.zip
+
+RUN cd FFmpeg-${FFMPEG_TAG} && ./configure \
+    --enable-libnpp \
+    --enable-nonfree \
+    --enable-nvdec \
+    --enable-nvenc \
+    --enable-cuvid \
+    --enable-cuda \
+    --enable-cuda-nvcc \
+    --enable-libvmaf \
+    --enable-ffnvcodec \
+    --disable-stripping \
+    --nvccflags="${NVCC_FLAGS}" && \
+    make -j && \
+    make install
+
+RUN mkdir /data
+# VMAF+decode GPU (only works for NVDec supported formats https://developer.nvidia.com/video-encode-and-decode-gpu-support-matrix-new)
+ENTRYPOINT ["ffmpeg"]

Dockerfile.cuda

@@ -17,6 +17,8 @@ NINJA := $(VIRTUAL_ENV_PATH)/ninja
 BUILDTYPE_RELEASE := --buildtype release
 BUILDTYPE_DEBUG := --buildtype debug
 ENABLE_FLOAT := -Denable_float=true
+ENABLE_NVCC :=	true
+ENABLE_CUDA := -Denable_cuda=true -Denable_nvcc=$(ENABLE_NVCC)
 
 # Directories
 LIBVMAF_DIR := libvmaf
@@ -30,10 +32,10 @@ default: build
 all: build debug install test cythonize
 
 $(BUILD_DIR): $(MESON) $(NINJA)
-	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(BUILD_DIR) $(LIBVMAF_DIR) $(BUILDTYPE_RELEASE) $(ENABLE_FLOAT)
+	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(BUILD_DIR) $(LIBVMAF_DIR) $(BUILDTYPE_RELEASE) $(ENABLE_FLOAT) $(ENABLE_CUDA)
 
 $(DEBUG_DIR): $(MESON) $(NINJA)
-	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(DEBUG_DIR) $(LIBVMAF_DIR) $(BUILDTYPE_DEBUG) $(ENABLE_FLOAT)
+	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(DEBUG_DIR) $(LIBVMAF_DIR) $(BUILDTYPE_DEBUG) $(ENABLE_FLOAT) $(ENABLE_CUDA)
 
 cythonize: cythonize-deps
 	pushd python && ../$(VENV_PYTHON) setup.py build_ext --build-lib . && popd || exit 1

Dockerfile.ffmpeg

@@ -1,6 +1,5 @@
 # VMAF - Video Multi-Method Assessment Fusion
 
-[![Build Status](https://app.travis-ci.com/Netflix/vmaf.svg?token=KLMprpotiqp3mZnrjtA6&branch=master)](https://app.travis-ci.com/Netflix/vmaf)
 [![libvmaf](https://github.com/Netflix/vmaf/actions/workflows/libvmaf.yml/badge.svg)](https://github.com/Netflix/vmaf/actions/workflows/libvmaf.yml)
 [![Windows](https://github.com/Netflix/vmaf/actions/workflows/windows.yml/badge.svg)](https://github.com/Netflix/vmaf/actions/workflows/windows.yml)
 [![ffmpeg](https://github.com/Netflix/vmaf/actions/workflows/ffmpeg.yml/badge.svg)](https://github.com/Netflix/vmaf/actions/workflows/ffmpeg.yml)

Makefile

@@ -37,3 +37,8 @@ option('enable_nvtx',
     type: 'boolean',
     value: false,
     description: 'Enable NVTX range support')
+
+option('enable_nvcc',
+    type: 'boolean',
+    value: true,
+    description: 'Use clang to compile CUDA code.')