feat: video

.github/workflows/build.yaml

@@ -2,6 +2,9 @@ name: Build
 
 on: [push]
 
+env:
+  MPV_VERSION: "20260118-git-468d34c"
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -40,7 +43,8 @@ jobs:
             gcc-13 g++-13 \
             libfontconfig1-dev \
             autoconf automake libtool pkg-config libltdl-dev \
-            libnotify-dev
+            libnotify-dev \
+            libmpv-dev
 
       - name: Install GCC
         if: runner.os == 'Linux'
@@ -63,7 +67,7 @@ jobs:
       - name: Collect dependencies (macOS)
         if: runner.os == 'macOS'
         run: |
-          brew install ffmpeg libass zimg imagemagick autoconf automake libtool gcc ffmpeg llvm@20 meson xxhash vapoursynth fftw dylibbundler
+          brew install ffmpeg libass zimg imagemagick autoconf automake libtool gcc ffmpeg llvm@20 meson xxhash vapoursynth fftw dylibbundler mpv
           cd ci
           bash build-dependencies-macos.sh
 
@@ -73,6 +77,19 @@ jobs:
           cd ci
           pwsh build-dependencies-windows.ps1
 
+      - name: Download libmpv (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-v3-${{ env.MPV_VERSION }}.7z/download > mpv.7z
+          7z x mpv.7z
+          mkdir mpv
+          mv include mpv
+          gendef libmpv-2.dll
+          mv libmpv-2.dll mpv/libmpv-2.dll
+          mv libmpv-2.def mpv.def
+          mv mpv.def libmpv.dll.a mpv/
+        shell: bash
+
       - name: Collect dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -151,6 +168,7 @@ jobs:
               curl -L https://aka.ms/vs/17/release/vc_redist.x64.exe -o installer/redist/vc_redist.x64.exe
               cp "$build_dir/blur-cli-$config.exe" installer/resources/blur-cli.exe
               cp "$build_dir/blur-$config.exe" installer/resources/blur-gui.exe
+              cp "mpv/libmpv-2.dll" installer/resources/
               iscc installer/setup.iss
 
               # Copy everything to bundle

.gitignore

@@ -1,6 +1,7 @@
 # dev
 /lib
 old
+/mpv
 
 # tests
 tests/assets/*

CMakeLists.txt

@@ -20,6 +20,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
     ${PROJECT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
 set(CMAKE_BINARY_DIR ${PROJECT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
 # packages
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(cpr CONFIG REQUIRED)
@@ -145,6 +147,27 @@ target_compile_definitions(blur PRIVATE IMGUI_IMPL_OPENGL_LOADER_CUSTOM)
 # stb
 target_include_directories(blur PRIVATE ${PROJECT_SOURCE_DIR}/dependencies/stb)
 
+# mpv
+find_package(MPV REQUIRED)
+
+target_include_directories(blur PRIVATE ${MPV_INCLUDE_DIRS})
+
+if(WIN32)
+  target_link_libraries(blur PRIVATE ${MPV_LIBRARY})
+
+  if(MPV_DLL)
+    add_custom_command(TARGET blur POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        "${MPV_DLL}"
+        "$<TARGET_FILE_DIR:blur>/"
+      COMMENT "Copying mpv DLL to output directory"
+    )
+  endif()
+else()
+  target_link_libraries(blur PRIVATE ${MPV_LIBRARY})
+  target_link_directories(blur PRIVATE ${MPV_LIBRARY_DIRS})
+endif()
+
 target_link_libraries(
   blur PRIVATE blur-common SDL3::SDL3 SDL3_image::SDL3_image Freetype::Freetype
                glad::glad)

CMakePresets.json

@@ -25,7 +25,9 @@
       },
       "cacheVariables": {
         "CMAKE_C_COMPILER": "cl",
-        "CMAKE_CXX_COMPILER": "cl"
+        "CMAKE_CXX_COMPILER": "cl",
+        "MPV_INCLUDE_DIR": "${sourceDir}/mpv/include",
+        "MPV_LIBRARY": "${sourceDir}/mpv/libmpv-2.dll"
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {

ci/build-dependencies-macos.sh

@@ -241,6 +241,15 @@ meson build
 ninja -C build
 " "build" "vapoursynth-plugins"
 
+## fmtconv
+build "https://gitlab.com/EleonoreMizo/fmtconv.git" "--single-branch" "259b702e4e3c1e2fc6d7b2c8e83d95b612519e89" "fmtconv" "
+cd build/unix
+./autogen.sh
+./configure
+make
+cd ../..
+" "build/unix/.libs" "vapoursynth-plugins"
+
 PATH="/opt/homebrew/opt/llvm@20/bin:$PATH"
 ZSTD_PREFIX=$(brew --prefix zstd)
 

ci/build-dependencies-windows.ps1

@@ -53,7 +53,8 @@ function Extract-Files {
             if (Test-Path $filePath) {
                 Copy-Item -Path $filePath -Destination $DestinationPath
                 Write-Host "Copied $pattern to $DestinationPath"
-            } else {
+            }
+            else {
                 Write-Warning "Could not find $pattern in the extracted files."
             }
         }
@@ -96,8 +97,8 @@ function Download-ModelFiles {
 }
 
 # Download and install VapourSynth
-$vapoursynthInstallerUrl = "https://github.com/vapoursynth/vapoursynth/releases/download/R70/Install-Portable-VapourSynth-R70.ps1"
-$vapoursynthInstallerPath = Join-Path $vapoursynthDir "Install-Portable-VapourSynth-R70.ps1"
+$vapoursynthInstallerUrl = "https://github.com/vapoursynth/vapoursynth/releases/download/R72/Install-Portable-VapourSynth-R72.ps1"
+$vapoursynthInstallerPath = Join-Path $vapoursynthDir "Install-Portable-VapourSynth-R72.ps1"
 Download-File -Url $vapoursynthInstallerUrl -OutFile $vapoursynthInstallerPath
 
 # Run VapourSynth installer
@@ -116,38 +117,38 @@ Set-Location $PWD
 # Plugin installations
 $plugins = @(
     @{
-        Name = "Akarin";
-        Url = "https://github.com/AkarinVS/vapoursynth-plugin/releases/download/v0.96/akarin-release-lexpr-amd64-v0.96g3.7z";
+        Name         = "Akarin";
+        Url          = "https://github.com/AkarinVS/vapoursynth-plugin/releases/download/v0.96/akarin-release-lexpr-amd64-v0.96g3.7z";
         FilePatterns = @("akarin.dll");
     },
     @{
-        Name = "BestSource";
-        Url = "https://github.com/vapoursynth/bestsource/releases/download/R11/BestSource-R11.7z";
+        Name         = "BestSource";
+        Url          = "https://github.com/vapoursynth/bestsource/releases/download/R11/BestSource-R11.7z";
         FilePatterns = @("BestSource.dll");
     },
     @{
-        Name = "LSmashSource";
-        Url = "https://github.com/HomeOfAviSynthPlusEvolution/L-SMASH-Works/releases/download/1194.0.0.0/L-SMASH-Works-r1194.0.0.0.7z";
+        Name         = "LSmashSource";
+        Url          = "https://github.com/HomeOfAviSynthPlusEvolution/L-SMASH-Works/releases/download/1194.0.0.0/L-SMASH-Works-r1194.0.0.0.7z";
         FilePatterns = @("x64/LSMASHSource.dll");
     },
     @{
-        Name = "MVTools";
-        Url = "https://github.com/dubhater/vapoursynth-mvtools/releases/download/v24/vapoursynth-mvtools-v24-win64.7z";
+        Name         = "MVTools";
+        Url          = "https://github.com/dubhater/vapoursynth-mvtools/releases/download/v24/vapoursynth-mvtools-v24-win64.7z";
         FilePatterns = @("libmvtools.dll");
     },
     @{
-        Name = "VapourSynth-RIFE-ncnn-Vulkan";
-        Url = "https://github.com/styler00dollar/VapourSynth-RIFE-ncnn-Vulkan/releases/download/r9_mod_v32/librife_windows_x86-64.dll";
+        Name        = "VapourSynth-RIFE-ncnn-Vulkan";
+        Url         = "https://github.com/styler00dollar/VapourSynth-RIFE-ncnn-Vulkan/releases/download/r9_mod_v32/librife_windows_x86-64.dll";
         IsDirectDll = $true;
-    },,
+    }, ,
     @{
-        Name = "Adjust";
-        Url = "https://github.com/f0e/Vapoursynth-adjust/releases/download/v1/adjust.dll";
+        Name        = "Adjust";
+        Url         = "https://github.com/f0e/Vapoursynth-adjust/releases/download/v1/adjust.dll";
         IsDirectDll = $true;
     },
     @{
-        Name = "SVPFlow";
-        Url = "https://web.archive.org/web/20190322064557if_/http://www.svp-team.com/files/gpl/svpflow-4.2.0.142.zip";
+        Name         = "SVPFlow";
+        Url          = "https://web.archive.org/web/20190322064557if_/http://www.svp-team.com/files/gpl/svpflow-4.2.0.142.zip";
         FilePatterns = @(
             "svpflow-4.2.0.142/lib-windows/vapoursynth/x64/svpflow1_vs64.dll",
             "svpflow-4.2.0.142/lib-windows/vapoursynth/x64/svpflow2_vs64.dll"
@@ -165,9 +166,10 @@ foreach ($plugin in $plugins) {
         # Direct DLL download (no extraction needed)
         $dllPath = Join-Path $pluginsDir "$($plugin.Name.ToLower()).dll"
         Download-File -Url $plugin.Url -OutFile $dllPath
-    } else {
+    }
+    else {
         # Archive download that needs extraction
-        $archiveExt = if ($plugin.Url.EndsWith('.zip')) {'.zip'} else {'.7z'}
+        $archiveExt = if ($plugin.Url.EndsWith('.zip')) { '.zip' } else { '.7z' }
         $archivePath = Join-Path $vapoursynthDir "$($plugin.Name.ToLower())$archiveExt"
         Download-File -Url $plugin.Url -OutFile $archivePath
         Extract-Files -ArchivePath $archivePath -FilePatterns $plugin.FilePatterns -DestinationPath $pluginsDir
@@ -186,15 +188,13 @@ Extract-Files -ArchivePath $ffmpegArchive -FilePatterns @(
 # Define model downloads
 $modelDownloads = @(
     @{
-        BaseUrl = "https://raw.githubusercontent.com/styler00dollar/VapourSynth-RIFE-ncnn-Vulkan/a2579e656dac7909a66e7da84578a2f80ccba41c/models/rife-v4.26_ensembleFalse";
+        BaseUrl   = "https://raw.githubusercontent.com/styler00dollar/VapourSynth-RIFE-ncnn-Vulkan/a2579e656dac7909a66e7da84578a2f80ccba41c/models/rife-v4.26_ensembleFalse";
         ModelName = "rife-v4.26_ensembleFalse";
-        FileList = @("flownet.bin", "flownet.param");
+        FileList  = @("flownet.bin", "flownet.param");
     }
 )
 
 # Download all models
 foreach ($model in $modelDownloads) {
     Download-ModelFiles -BaseUrl $model.BaseUrl -ModelName $model.ModelName -FileList $model.FileList
 }
-
-Write-Host "Done"

cmake/FindMPV.cmake

@@ -0,0 +1,102 @@
+# https://github.com/jellyfin/jellyfin-desktop
+
+# ##############################################################################
+# CMake module to search for the mpv libraries.
+#
+# WARNING: This module is experimental work in progress.
+#
+# Based one FindVLC.cmake by: Copyright (c) 2011 Michael Jansen
+# <info@michael-jansen.biz> Modified by Tobias Hieta <tobias@hieta.se>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# ##############################################################################
+
+#
+# Global Configuration Section
+#
+set(_MPV_REQUIRED_VARS MPV_INCLUDE_DIR MPV_LIBRARY)
+
+#
+# MPV uses pkgconfig.
+#
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_MPV QUIET mpv)
+endif(PKG_CONFIG_FOUND)
+
+#
+# Look for the include files.
+#
+find_path(
+  MPV_INCLUDE_DIR
+  NAMES mpv/client.h
+  HINTS ${PC_MPV_INCLUDEDIR} ${PC_MPV_INCLUDE_DIRS} # Unused for MPV but anyway
+  DOC "MPV include directory")
+
+if(WIN32)
+  # don't ask me why this is needed
+  unset(MPV_LIBRARY CACHE)
+
+  find_file(
+    MPV_LIBRARY
+    NAMES libmpv.dll.a
+    PATHS
+      ${CMAKE_SOURCE_DIR}/mpv
+      ${CMAKE_SOURCE_DIR}/mpv/lib
+      $ENV{MPV_DIR}
+      $ENV{MPV_DIR}/lib
+    NO_DEFAULT_PATH
+    DOC "MPV import library")
+
+  find_file(
+    MPV_DLL
+    NAMES libmpv-2.dll
+    PATHS
+      ${CMAKE_SOURCE_DIR}/mpv
+      ${CMAKE_SOURCE_DIR}/mpv/bin
+      $ENV{MPV_DIR}
+      $ENV{MPV_DIR}/bin
+    NO_DEFAULT_PATH
+    DOC "MPV runtime DLL")
+
+  if(MPV_LIBRARY)
+    get_filename_component(_MPV_LIBRARY_DIR ${MPV_LIBRARY} DIRECTORY)
+  endif()
+else()
+  #
+  # Look for the libraries
+  #
+  set(_MPV_LIBRARY_NAMES mpv)
+  if(PC_MPV_LIBRARIES)
+    set(_MPV_LIBRARY_NAMES ${PC_MPV_LIBRARIES})
+  endif(PC_MPV_LIBRARIES)
+
+  foreach(l ${_MPV_LIBRARY_NAMES})
+    find_library(
+      MPV_LIBRARY_${l}
+      NAMES ${l}
+      HINTS ${PC_MPV_LIBDIR} ${PC_MPV_LIBRARY_DIRS} # Unused for MPV but anyway
+      PATH_SUFFIXES lib${LIB_SUFFIX})
+    list(APPEND MPV_LIBRARY ${MPV_LIBRARY_${l}})
+  endforeach()
+
+  get_filename_component(_MPV_LIBRARY_DIR ${MPV_LIBRARY_mpv} PATH)
+  mark_as_advanced(MPV_LIBRARY)
+endif()
+
+set(MPV_LIBRARY_DIRS _MPV_LIBRARY_DIR)
+list(REMOVE_DUPLICATES MPV_LIBRARY_DIRS)
+
+mark_as_advanced(MPV_INCLUDE_DIR)
+mark_as_advanced(MPV_LIBRARY_DIRS)
+set(MPV_INCLUDE_DIRS ${MPV_INCLUDE_DIR})
+
+#
+# Check if everything was found and if the version is sufficient.
+#
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  MPV
+  REQUIRED_VARS ${_MPV_REQUIRED_VARS}
+  VERSION_VAR MPV_VERSION_STRING)

installer/setup.iss

@@ -40,10 +40,10 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 Name: envPath; Description: "Add to PATH"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
 [Files]
 Source: ".\resources\blur-gui.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: ".\resources\blur-cli.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: ".\resources\libmpv-2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: ".\dependencies\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: ".\redist\VC_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 

src/cli/cli.cpp

@@ -80,12 +80,17 @@ bool cli::run(
 				std::filesystem::create_directories(output_path->parent_path());
 		}
 
-		rendering::video_render_queue.add(
+		auto add_res = rendering::video_render_queue.add(
 			input_path, video_info, config_path, config_app::get_app_config(), output_path
 		);
 
-		if (blur.verbose) {
-			u::log("Queued '{}' for render", input_path.stem());
+		if (add_res.error) {
+			u::log("Failed to queue '{}' for render: {}", input_path.stem(), *add_res.error);
+		}
+		else {
+			if (blur.verbose) {
+				u::log("Queued '{}' for render", input_path.stem());
+			}
 		}
 	}