Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e1736ce
Add experimental Vulkan GPU frame pipeline
jonoomph Oct 28, 2026
0f79e66
Embed Vulkan shaders in libopenshot
jonoomph Oct 28, 2026
142505e
Fall back to the CPU pipeline when Vulkan is off or fails
jonoomph Oct 28, 2026
8804add
Run Vulkan tests automatically and report skips
jonoomph Oct 28, 2026
80ccd6e
Keep Vulkan compositor passes in flight instead of waiting on each
jonoomph Oct 28, 2026
094700a
Transform and composite timeline layers in one Vulkan pass
jonoomph Oct 28, 2026
1fc7e02
Share Vulkan output pools and allow releasing their memory
jonoomph Oct 28, 2026
4be2077
Wait less for audio before finishing reader frames
jonoomph Oct 28, 2026
1baecd2
Start each GPU export with fresh frame pools
jonoomph Oct 28, 2026
0dd3d1d
Skip FFmpeg 7's zeroed spherical angles in the metadata tests
jonoomph Oct 29, 2026
c71b9e0
Build the Linux CI library with Vulkan and FFmpeg 7
jonoomph Oct 29, 2026
e902924
Pick a real GPU for Vulkan instead of FFmpeg's first device
jonoomph Oct 29, 2026
011aee9
Share GPU frames with VA-API encoders and add GPU inspection helpers
jonoomph Oct 29, 2026
5b96976
Encode Vulkan frames without CPU readback
jonoomph Oct 29, 2026
86669a1
Skip native Vulkan encoders on old Vulkan loaders
jonoomph Oct 29, 2026
30d2abe
Use FFmpeg 7.1 in runner builds and installer packaging
jonoomph Oct 30, 2026
35efd38
Fix Windows dependency paths and stabilize CI autogen
jonoomph Oct 30, 2026
cc21c06
Print GitLab server version in pipeline setup
jonoomph Oct 30, 2026
3406810
Share Mac video surfaces and enable Windows GPU preview
jonoomph Oct 30, 2026
bd78acd
Report GPU capabilities and native presentation fallback reasons
jonoomph Oct 30, 2026
2eadbfa
Track GPU work and render CPU-origin images with Vulkan
jonoomph Oct 31, 2026
55db9cc
Use shared Mac surfaces for cached image uploads
jonoomph Oct 31, 2026
7001bb6
Build Windows FFmpeg with NVENC, QSV, and AMF
jonoomph Nov 1, 2026
05eb19d
Add QSV and AMF to Linux FFmpeg builds
jonoomph Nov 1, 2026
9ddcede
Diagnose GPU presentation and allow CPU display fallback
jonoomph Nov 1, 2026
055c66f
Present Vulkan frames through a presenter-owned shared image
jonoomph Nov 1, 2026
bffc1f6
Share presentation frames through a linear buffer and skip GPU teardo…
jonoomph Nov 1, 2026
f5d8294
Keep the Vulkan upload cache alive through process exit
jonoomph Nov 1, 2026
67c636f
Fix GPU upload leaks and race, and report GPU failures clearly
jonoomph Nov 2, 2026
5b58759
Recover the GPU preview from errors and continue on the CPU after dev…
jonoomph Nov 2, 2026
8fcaa3b
Add temporary GPU debug logging and preview handoff switches
jonoomph Nov 2, 2026
fcf8dc1
Keep Win32 preview handles open and log why frames are read back
jonoomph Nov 3, 2026
a577b58
Free CUDA-mapped NV12 export frames when the writer closes
jonoomph Nov 3, 2026
a5967d3
Count encoder readbacks in export GPU reporting
jonoomph Nov 4, 2026
e891606
Prefer GPU-capable AV1 decoding when Vulkan supports it
jonoomph Nov 4, 2026
8dff7c4
Use the Qt 5.15 SDK for Linux Vulkan builds
jonoomph Nov 4, 2026
c0c25d2
Merge develop into vulkan-mvp
jonoomph Nov 4, 2026
e4c63eb
Bump Vulkan library builds to 1.2.0-dev1 and require audio 1.1.0
jonoomph Nov 4, 2026
0ee586b
Accelerate common Vulkan effects and reuse GPU pipelines
jonoomph Nov 5, 2026
29dd358
Avoid AMD Linux Vulkan host-import failures and protect CPU recovery
jonoomph Nov 5, 2026
47471e8
Restore Mac preview texture state and stop drawing after device loss
jonoomph Nov 6, 2026
57eac8b
Fix CPU-only builds with older FFmpeg
jonoomph Nov 6, 2026
53b42d8
Keep LUTs, effect masks and scopes on Vulkan
jonoomph Nov 6, 2026
5b4620f
Keep drive-amount and video masks on Vulkan
jonoomph Nov 6, 2026
8b553b9
Allow one byte in the masked blend test on Metal
jonoomph Nov 6, 2026
ae9a16e
Decode 10-bit, HDR and tagged color correctly; tag exports
jonoomph Nov 7, 2026
1dd9627
Fix color tests on Windows and Intel Mac CI
jonoomph Nov 7, 2026
8d7baf9
Enlarge color charts to 640x384 so Intel Macs decode them on the GPU
jonoomph Nov 7, 2026
338d9ea
Load Vulkan at runtime and fall back to the CPU without it
jonoomph Nov 7, 2026
b17d27e
Fix Vulkan lint warnings and missing license headers
jonoomph Nov 8, 2026
16ccf91
Speed up waveform extraction and extract all channels in one pass
jonoomph Nov 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/ffmpeg-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@

name: FFmpeg compatibility
on:
push:
branches: [vulkan-mvp]
pull_request:
paths:
- 'src/FFmpeg*'
- 'src/Vulkan*'
- 'src/GpuDevices*'
- 'src/Qt/Vulkan*'
- 'tests/FFmpeg*'
- 'tests/Vulkan*'
- 'tests/CMakeLists.txt'
- '.github/workflows/ffmpeg-compatibility.yml'
workflow_dispatch:
Expand Down Expand Up @@ -57,7 +63,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y cmake ninja-build pkg-config nasm catch2 \
libasound2-dev qtbase5-dev libqt5svg5-dev libbabl-dev libjsoncpp-dev \
libx264-dev libvpx-dev libvorbis-dev
libx264-dev libvpx-dev libvorbis-dev libvulkan-dev glslang-tools
- name: Build isolated FFmpeg and audio dependencies
run: |
prefix="$RUNNER_TEMP/ffmpeg-dependencies"
Expand All @@ -83,9 +89,11 @@ jobs:
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="$RUNNER_TEMP/ffmpeg-dependencies" \
-DENABLE_LIB_DOCS=OFF -DENABLE_PYTHON=OFF -DENABLE_OPENCV=OFF \
-DENABLE_MAGICK=OFF -DUSE_QT6=OFF
-DENABLE_MAGICK=OFF -DUSE_QT6=OFF -DENABLE_GPU_FRAME=ON
cmake --build build --parallel 2 --target \
openshot-FFmpegCapabilities-test openshot-FFmpegWriter-test
openshot-FFmpegCapabilities-test openshot-FFmpegWriter-test \
openshot-VulkanCompositor-test openshot-VulkanPresentation-test
- name: Test capability validation and audio/video exports
working-directory: build
run: ctest -L '^(FFmpegCapabilities|FFmpegWriter)$' --output-on-failure --timeout 180 -j2
# Hardware cases skip without Vulkan support; the CPU fallback still runs.
run: ctest -L '^(FFmpegCapabilities|FFmpegWriter|VulkanCompositor|VulkanPresentation)$' --output-on-failure --timeout 180 -j2
16 changes: 11 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ init-builders:
linux-builder:
stage: build-libopenshot
variables:
OPENSHOT_QT_ROOT: /opt/openshot/qt-5.15.19
OPENCV_ROOT: /opt/opencv-4.13.0
OpenCV_DIR: /opt/opencv-4.13.0/lib/cmake/opencv4
# Runner image provides FFmpeg 7 (with Vulkan) and newer Vulkan headers in /opt
FFMPEG_ROOT: /opt/ffmpeg-7.1.3
VULKAN_HEADERS_ROOT: /opt/vulkan-headers
artifacts:
expire_in: 6 months
paths:
- build/install-x64/*
- build/ffmpeg-hardware-check/*
script:
- "curl -O -J -L --header PRIVATE-TOKEN:$ACCESS_TOKEN http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/$CI_COMMIT_REF_NAME/download?job=linux-builder"
- if [ ! -f artifacts.zip ]; then
Expand All @@ -43,13 +47,14 @@ linux-builder:
- export PKG_CONFIG_PATH="$OPENCV_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH"
- export LD_LIBRARY_PATH="$OPENCV_ROOT/lib:$LD_LIBRARY_PATH"
- export PATH="$OPENCV_ROOT/bin:$PATH"
- if [ ! -f "$FFMPEG_ROOT/env.sh" ]; then echo "ERROR runner is missing $FFMPEG_ROOT"; exit 1; fi
- if [ ! -f "$FFMPEG_ROOT/env.sh" ]; then echo "ERROR runner is missing $FFMPEG_ROOT (FFmpeg 7 with Vulkan)"; exit 1; fi
- . "$FFMPEG_ROOT/env.sh"
- . "$OPENSHOT_QT_ROOT/env.sh"
- export FFMPEGDIR="$FFMPEG_ROOT"
- bash ci/linux/check-ffmpeg-hardware.sh "$FFMPEG_ROOT" "$CI_PROJECT_DIR/build/ffmpeg-hardware-check"
- mkdir -p build; cd build;
- pkg-config --exists libpipewire-0.3 libspa-0.2 gio-2.0 gio-unix-2.0 || echo "WARNING PipeWire Wayland capture dependencies are missing; building without Wayland capture support"
- cmake -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"OpenCV_DIR:PATH=$OpenCV_DIR" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_BUILD_TYPE:STRING=Release -DAPPIMAGE_BUILD=1 -DUSE_SYSTEM_JSONCPP=0 -DENABLE_WAYLAND_CAPTURE=ON ../
- cmake -U "Qt5*_DIR" -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"OpenCV_DIR:PATH=$OpenCV_DIR" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_BUILD_TYPE:STRING=Release -DAPPIMAGE_BUILD=1 -DUSE_QT6=OFF -DUSE_SYSTEM_JSONCPP=0 -DENABLE_WAYLAND_CAPTURE=ON -DENABLE_GPU_FRAME=ON -D"Vulkan_INCLUDE_DIR:PATH=$VULKAN_HEADERS_ROOT/include" -D"CMAKE_CXX_FLAGS=-I$VULKAN_HEADERS_ROOT/include" ../
- cmake --build . --parallel $(nproc)
- ldd src/libopenshot.so | tee libopenshot-deps.log
- if grep -qE "not found|libavcodec\.so\.58|libavutil\.so\.56" libopenshot-deps.log; then echo "ERROR unresolved libraries or system FFmpeg 4.2"; exit 1; fi
Expand Down Expand Up @@ -89,7 +94,8 @@ mac-builder:
- export PKG_CONFIG_PATH="$FFMPEGDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
- export DYLD_LIBRARY_PATH=$FFMPEGDIR/lib:$OPENCV_ROOT/lib:$DYLD_LIBRARY_PATH
- mkdir -p build; cd build;
- cmake -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_SHARED_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"OpenCV_DIR:PATH=$OpenCV_DIR" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.12" -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
- test -f "$FFMPEGDIR/lib/libMoltenVK.dylib" && test -x "$FFMPEGDIR/bin/glslangValidator"
- cmake -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DENABLE_GPU_FRAME=ON -D"Vulkan_INCLUDE_DIR:PATH=$FFMPEGDIR/include" -D"Vulkan_LIBRARY:FILEPATH=$FFMPEGDIR/lib/libMoltenVK.dylib" -D"GLSLANG_VALIDATOR:FILEPATH=$FFMPEGDIR/bin/glslangValidator" -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_SHARED_LINKER_FLAGS="-stdlib=libc++" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"OpenCV_DIR:PATH=$OpenCV_DIR" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.15" -DCMAKE_PREFIX_PATH=/usr/local/qt5.15.X/qt5.15/5.15.0/clang_64/ -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
- cmake --build . --parallel $(sysctl -n hw.ncpu)
- make install
- find "$CI_PROJECT_DIR/build/install-x64" -type f \( -name "*.dylib" -or -name "*.so" \) -exec sh -c 'for f do if ! otool -l "$f" | grep -q "$OPENCV_ROOT/lib"; then install_name_tool -add_rpath "$OPENCV_ROOT/lib" "$f" || true; fi; done' sh {} +
Expand Down Expand Up @@ -125,7 +131,7 @@ windows-builder-x64:
- 'if ($LASTEXITCODE -ne 0) { throw "Could not enumerate FFmpeg encoders" }; foreach ($codec in @("h264_nvenc", "hevc_nvenc", "h264_qsv", "hevc_qsv", "h264_amf", "hevc_amf")) { if ($gpuEncoders -notmatch "\b$codec\b") { throw "Windows FFmpeg is missing required hardware encoder $codec" } }'
- ffmpeg -hide_banner -devices | findstr /I "gdigrab"
- ffmpeg -hide_banner -devices | findstr /I "dshow"
- cmake -B build -S . -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"babl_DIR=C:/msys64/mingw64" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-x64" -D"OpenCV_DIR:PATH=$env:OpenCV_DIR" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_AUTOGEN_PARALLEL=1 -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release"
- cmake -B build -S . -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"babl_DIR=C:/msys64/mingw64" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-x64" -D"OpenCV_DIR:PATH=$env:OpenCV_DIR" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_AUTOGEN_PARALLEL=1 -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -DENABLE_GPU_FRAME=ON
- cmake --build build --parallel 4
- $testList = ctest --test-dir build --show-only=json-v1 | ConvertFrom-Json
- if ($LASTEXITCODE -ne 0 -or @($testList.tests).Count -lt 400) { throw "Incomplete unit test discovery; check runtime DLL paths" }
Expand Down Expand Up @@ -202,7 +208,7 @@ windows-builder-x86:
- 'if ($LASTEXITCODE -ne 0) { throw "Could not enumerate FFmpeg encoders" }; foreach ($codec in @("h264_nvenc", "hevc_nvenc", "h264_qsv", "hevc_qsv", "h264_amf", "hevc_amf")) { if ($gpuEncoders -notmatch "\b$codec\b") { throw "Windows FFmpeg is missing required hardware encoder $codec" } }'
- ffmpeg -hide_banner -devices | findstr /I "gdigrab"
- ffmpeg -hide_banner -devices | findstr /I "dshow"
- cmake -B build -S . -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"babl_DIR=C:/msys64/mingw32" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-x86" -D"OpenCV_DIR:PATH=$env:OpenCV_DIR" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_AUTOGEN_PARALLEL=1 -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32 -msse2 -mfpmath=sse" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32 -msse2 -mfpmath=sse"
- cmake -B build -S . -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"babl_DIR=C:/msys64/mingw32" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-x86" -D"OpenCV_DIR:PATH=$env:OpenCV_DIR" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_AUTOGEN_PARALLEL=1 -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32 -msse2 -mfpmath=sse" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32 -msse2 -mfpmath=sse" -DENABLE_GPU_FRAME=ON
- cmake --build build --parallel 4
- $testList = ctest --test-dir build --show-only=json-v1 | ConvertFrom-Json
- if ($LASTEXITCODE -ne 0 -or @($testList.tests).Count -lt 400) { throw "Incomplete unit test discovery; check runtime DLL paths" }
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ For more information, please visit <http://www.openshot.org/>.
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")

################ PROJECT VERSION ####################
set(PROJECT_VERSION_FULL "1.1.1")
set(PROJECT_VERSION_FULL "1.2.0-dev1")
set(PROJECT_SO_VERSION 33)

# Remove the dash and anything following, to get the #.#.# version for project()
Expand Down Expand Up @@ -75,6 +75,7 @@ option(ENABLE_OPENCV "Build with OpenCV algorithms (requires Boost, Protobuf 3)"
option(ENABLE_WAYLAND_CAPTURE "Build Wayland screen capture support with xdg-desktop-portal and PipeWire (Linux only)" ON)
option(USE_HW_ACCEL "Enable hardware-accelerated encoding-decoding with FFmpeg 3.4+" ON)
option(ENABLE_VULKAN_BENCHMARK "Build the experimental Vulkan benchmark example" OFF)
option(ENABLE_GPU_FRAME "Build experimental deferred GPU frame storage" OFF)

# Legacy commandline override
if (DISABLE_TESTS)
Expand Down
8 changes: 8 additions & 0 deletions bindings/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ if (CMAKE_VERSION VERSION_GREATER 3.20)
endif()

### Add the SWIG interface file (which defines all the SWIG methods)
# Older UseSWIG versions do not track transitive %include headers. Regenerate
# the wrapper when GPU diagnostics change, including in incremental builds.
set(SWIG_MODULE_pyopenshot_EXTRA_DEPS
"${PROJECT_SOURCE_DIR}/src/GpuDevices.h"
"${PROJECT_SOURCE_DIR}/src/GpuMetrics.h"
"${PROJECT_SOURCE_DIR}/src/Timeline.h"
"${PROJECT_SOURCE_DIR}/src/FFmpegWriter.h"
"${PROJECT_SOURCE_DIR}/src/Qt/VulkanOpenGLPresenter.h")
swig_add_library(pyopenshot LANGUAGE python SOURCES openshot.i)

if (POLICY CMP0078)
Expand Down
15 changes: 15 additions & 0 deletions bindings/python/openshot.i
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ class QWidget;
#include "QtTextReader.h"
#include "KeyFrame.h"
#include "RendererBase.h"
#if defined(OPENSHOT_ENABLE_GPU_FRAME)
#include "Qt/VulkanOpenGLPresenter.h"
#include "VulkanCompositor.h"
#include "VulkanFrameImage.h"
#include "GpuDevices.h"
#endif
#include "GpuMetrics.h"
#include "Settings.h"
#include "TimelineBase.h"
#include "Timeline.h"
Expand Down Expand Up @@ -520,6 +527,14 @@ static int openshot_swig_is_qwidget(PyObject *obj) {
%include "KeyFrame.h"
%include "AnimatedCurve.h"
%include "RendererBase.h"
#if defined(OPENSHOT_ENABLE_GPU_FRAME)
%include "Qt/VulkanOpenGLPresenter.h"
namespace openshot { void ReleaseVulkanMemory(); uint64_t VulkanFrameReadbackCount(); uint64_t VulkanUploadFailureCount(); }
%include "GpuDevices.h"
%template(GpuDeviceVector) std::vector<openshot::GpuDevice>;
%template(StringVector) std::vector<std::string>;
#endif
%include "GpuMetrics.h"
%include "Settings.h"
%include "TimelineBase.h"
%include "Qt/VideoCacheThread.h"
Expand Down
4 changes: 2 additions & 2 deletions ci/linux/check-ffmpeg-hardware.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH="$root/lib:${LD_LIBRARY_PATH:-}"
"$root/bin/ffmpeg" -hide_banner -version > "$log/version.txt"
"$root/bin/ffmpeg" -hide_banner -encoders > "$log/encoders.txt" 2>&1
"$root/bin/ffmpeg" -hide_banner -hwaccels > "$log/hwaccels.txt" 2>&1
for codec in h264_nvenc hevc_nvenc h264_qsv hevc_qsv h264_amf hevc_amf h264_vaapi hevc_vaapi; do
for codec in h264_nvenc hevc_nvenc h264_qsv hevc_qsv h264_amf hevc_amf h264_vaapi hevc_vaapi h264_vulkan hevc_vulkan; do
grep -Eq "[[:space:]]$codec[[:space:]]" "$log/encoders.txt" || { echo "Missing required encoder: $codec"; exit 1; }
done
ldd "$root/lib/libavcodec.so.61" > "$log/avcodec-dependencies.txt"
Expand All @@ -21,4 +21,4 @@ grep -q 'libvpl.so.2' "$log/avcodec-dependencies.txt"
"$root/bin/ffmpeg" -v error -i "$log/h264-aac.mp4" -f null -
"$root/bin/ffmpeg" -v error -f lavfi -i testsrc2=size=128x96:rate=4 -frames:v 4 -c:v libaom-av1 -cpu-used 8 -threads 2 -y "$log/av1.webm"
"$root/bin/ffmpeg" -v error -c:v libdav1d -i "$log/av1.webm" -f null -
echo 'SUCCESS: NVENC, QSV, AMF and VA-API encoders compiled; dispatcher linked; H.264/AAC and AV1 software smoke tests passed'
echo 'SUCCESS: NVENC, QSV, AMF, VA-API and Vulkan encoders compiled; dispatcher linked; H.264/AAC and AV1 software smoke tests passed'
Loading
Loading