From 89e4723d53881927518aac25031d2b419f9474d6 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Sun, 25 Oct 2026 16:42:47 -0500 Subject: [PATCH 1/6] Bump libopenshot to 1.1.0, SO 33, requiring OpenShotAudio 1.0.2 --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24bda253a..2396801b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ For more information, please visit . set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") ################ PROJECT VERSION #################### -set(PROJECT_VERSION_FULL "1.0.1") -set(PROJECT_SO_VERSION 32) +set(PROJECT_VERSION_FULL "1.1.0") +set(PROJECT_SO_VERSION 33) # Remove the dash and anything following, to get the #.#.# version for project() STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8db9ff29e..87867c6aa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -237,7 +237,7 @@ add_feature_info("Wayland screen capture" OPENSHOT_WAYLAND_CAPTURE "Use the opti # Find JUCE-based openshot Audio libraries if(NOT TARGET OpenShot::Audio) # Only load if necessary (not for integrated builds) - find_package(OpenShotAudio 1.0.1 REQUIRED) + find_package(OpenShotAudio 1.0.2 REQUIRED) endif() target_link_libraries(openshot PUBLIC OpenShot::Audio) From db0c67d6515466c917fdcdff24690ef295236056 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 26 Oct 2026 23:41:22 -0500 Subject: [PATCH 2/6] Return black for missing opening pictures without decoding to EOF --- src/FFmpegReader.cpp | 14 +++++ src/FFmpegReader.h | 2 + tests/FFmpegReader.cpp | 128 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index ca32da3fd..842bf69fb 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -800,6 +800,7 @@ void FFmpegReader::Close() { seek_audio_frame_found = 0; seek_video_frame_found = 0; current_video_frame = 0; + first_video_frame = 0; last_video_frame.reset(); last_final_video_frame.reset(); } @@ -2098,6 +2099,9 @@ void FFmpegReader::ProcessVideoPacket(int64_t requested_frame) { f->AddImage(width, height, bytes_per_pixel, QImage::Format_RGBA8888, buffer); } ApplyFrameOrientation(f); + if (first_video_frame == 0 && !is_seeking) { + first_video_frame = current_frame; + } // Update working cache working_cache.Add(f); @@ -2397,6 +2401,8 @@ void FFmpegReader::Seek(int64_t requested_frame) { hold_packet = false; last_frame = 0; current_video_frame = 0; + // A seek landing is not the beginning. Close/Open below resets this for a restart. + first_video_frame = -1; largest_frame_processed = 0; last_final_video_frame.reset(); bool has_audio_override = info.has_audio; @@ -2920,6 +2926,14 @@ void FFmpegReader::CheckWorkingFrames(int64_t requested_frame) { } } + // A decoded picture from the start establishes the initial gap. Fill only + // that gap, after the normal audio readiness check, rather than reading + // to EOF waiting for an image that cannot arrive. Do not use seek landings. + if (!f->has_image_data && is_video_ready && is_audio_ready + && !is_seeking && first_video_frame > f->number) { + f->AddColor("#000000"); + } + // Do not finalize non-EOF video frames without decoded image data. // This prevents repeated previous-frame fallbacks being cached as real frames. if (!f->has_image_data) { diff --git a/src/FFmpegReader.h b/src/FFmpegReader.h index 7a8143e1b..c8f1abfce 100644 --- a/src/FFmpegReader.h +++ b/src/FFmpegReader.h @@ -143,6 +143,8 @@ namespace openshot { int64_t last_frame; int64_t largest_frame_processed; int64_t current_video_frame; + // First decoded picture from the beginning: 0 unknown, -1 after a mid-file seek. + int64_t first_video_frame = 0; int64_t audio_pts; int64_t video_pts; diff --git a/tests/FFmpegReader.cpp b/tests/FFmpegReader.cpp index 16c5e12a7..a91e73a16 100644 --- a/tests/FFmpegReader.cpp +++ b/tests/FFmpegReader.cpp @@ -783,6 +783,134 @@ TEST_CASE( "Missing_Image_Frame_Finalizes_Using_Previous_Image", "[libopenshot][ CHECK(r.final_cache.GetFrame(58) != nullptr); } +TEST_CASE("Initial missing pictures wait for audio but not EOF", "[libopenshot][ffmpegreader][initial-gap]") +{ + FFmpegReader r("synthetic-initial-gap", DurationStrategy::VideoPreferred, false); + r.info.has_video = true; + r.info.has_audio = true; + r.info.has_single_image = false; + r.info.width = 160; + r.info.height = 90; + r.info.fps = Fraction(30, 1); + r.info.sample_rate = 48000; + r.info.channels = 1; + r.info.channel_layout = LAYOUT_MONO; + r.pts_offset_seconds = 0.0; + r.packet_status.reset(false); + r.video_pts_seconds = 0.5; + r.audio_pts_seconds = 1.1; + r.first_video_frame = 16; + auto frame = r.CreateFrame(1); + const float sample = 0.25f; + frame->AddAudio(true, 0, 0, &sample, 1, 1.0f); + + SECTION("Initial gap becomes black without changing its audio") { + r.CheckWorkingFrames(1); + auto result = r.final_cache.GetFrame(1); + REQUIRE(result != nullptr); + CHECK(result->CheckPixel(0, 0, 0, 0, 0, 255, 0)); + CHECK(result->GetAudioSamples(0)[0] == sample); + CHECK_FALSE(r.packet_status.end_of_file); + } + SECTION("Earlier audio packets alone do not make the frame ready") { + r.audio_pts_seconds = -0.02; + r.CheckWorkingFrames(1); + CHECK(r.final_cache.GetFrame(1) == nullptr); + CHECK_FALSE(frame->has_image_data); + } + SECTION("Video-only initial gaps need no audio wait") { + r.info.has_audio = false; + r.audio_pts_seconds = -0.02; + r.CheckWorkingFrames(1); + REQUIRE(r.final_cache.GetFrame(1) != nullptr); + CHECK(r.final_cache.GetFrame(1)->CheckPixel(0, 0, 0, 0, 0, 255, 0)); + } + SECTION("Wait for actual decoded output, not a later packet timestamp") { + r.first_video_frame = 0; + r.CheckWorkingFrames(1); + CHECK(r.final_cache.GetFrame(1) == nullptr); + } + SECTION("A missing picture after the first decoded picture is not an initial gap") { + r.first_video_frame = 1; + r.CheckWorkingFrames(1); + CHECK(r.final_cache.GetFrame(1) == nullptr); + } + SECTION("A completed mid-file seek cannot establish an initial gap") { + r.first_video_frame = -1; + r.CheckWorkingFrames(1); + CHECK(r.final_cache.GetFrame(1) == nullptr); + } + SECTION("A seek in progress cannot establish an initial gap") { + r.is_seeking = true; + r.CheckWorkingFrames(1); + CHECK(r.final_cache.GetFrame(1) == nullptr); + } +} + +TEST_CASE("Initial video gap preserves decoded pictures and survives seeking", "[libopenshot][ffmpegreader][initial-gap]") +{ + if (std::system("ffmpeg -hide_banner -version >/dev/null 2>&1") != 0) { + WARN("Skipping initial-gap fixture: ffmpeg executable not available"); + return; + } + const auto suffix = std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()); + TemporaryFileGuard source("initial-gap-source-" + suffix + ".mp4"); + TemporaryFileGuard gap("initial-gap-" + suffix + ".mkv"); + const std::string encode = "ffmpeg -y -hide_banner -loglevel error " + "-f lavfi -i testsrc2=size=160x90:rate=30 " + "-f lavfi -i sine=frequency=440:sample_rate=48000 -t 5 " + "-c:v libx264 -g 30 -keyint_min 30 -sc_threshold 0 -bf 2 -c:a aac " + source.path; + REQUIRE(std::system(encode.c_str()) == 0); + // Preserve non-key packets at the start: decoding cannot produce a picture + // until the next keyframe. Audio starts earlier, and B-frames require reordering. + const std::string trim = "ffmpeg -y -hide_banner -loglevel error -i " + source.path + + " -ss 0.5 -c copy -copyinkf -avoid_negative_ts disabled " + gap.path; + REQUIRE(std::system(trim.c_str()) == 0); + HardwareDecoderSettingsGuard guard; + Settings::Instance()->HARDWARE_DECODER = 0; + FFmpegReader normal(source.path); + normal.Open(); + auto normal_first = normal.GetFrame(1); + CHECK(normal.first_video_frame == 1); + CHECK(SampleAverageLuma(normal_first) > 10.0); + + FFmpegReader r(gap.path); + r.Open(); + CHECK(r.aStream->start_time * av_q2d(r.aStream->time_base) + < r.pStream->start_time * av_q2d(r.pStream->time_base)); + auto first = r.GetFrame(1); + REQUIRE(first != nullptr); + CHECK(first->CheckPixel(0, 0, 0, 0, 0, 255, 0)); + CHECK_FALSE(r.packet_status.packets_eof); + CHECK(r.packet_status.video_decoded < 60); + const int64_t first_picture = r.first_video_frame; + REQUIRE(first_picture > 1); + REQUIRE(first_picture < 30); + REQUIRE(first->GetAudioSamplesCount() > 0); + float peak_audio = 0.0f; + for (int i = 0; i < first->GetAudioSamplesCount(); ++i) + peak_audio = std::max(peak_audio, std::abs(first->GetAudioSamples(0)[i])); + CHECK(peak_audio > 0.01f); + for (int64_t n = 2; n < first_picture; ++n) + CHECK(r.GetFrame(n)->CheckPixel(0, 0, 0, 0, 0, 255, 0)); + auto picture = r.GetFrame(first_picture); + CHECK(SampleAverageLuma(picture) > 10.0); + // Stream copy preserves the original picture at 1 second (frame 31). + CHECK(*picture->GetImage() == *normal.GetFrame(31)->GetImage()); + r.GetFrame(100); + CHECK(r.first_video_frame == -1); // A mid-file seek must not define a startup gap. + r.GetCache()->Clear(); + CHECK(r.GetFrame(1)->CheckPixel(0, 0, 0, 0, 0, 255, 0)); + CHECK_FALSE(r.packet_status.packets_eof); + CHECK(*r.GetFrame(first_picture)->GetImage() == *picture->GetImage()); + r.Close(); + CHECK(r.first_video_frame == 0); + r.Open(); + CHECK(r.GetFrame(1)->CheckPixel(0, 0, 0, 0, 0, 255, 0)); + r.Close(); + normal.Close(); +} + TEST_CASE( "HardwareDecodeSuccessful_IsFalse_WhenHardwareDecodeIsDisabled", "[libopenshot][ffmpegreader][hardware]" ) { HardwareDecoderSettingsGuard guard; From ad96f7e428f4fd2cc156c07278c5101f5f05e0d7 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 26 Oct 2026 23:52:51 -0500 Subject: [PATCH 3/6] Allow Windows camera reads to stop before worker-thread cleanup --- src/CameraCaptureReader.cpp | 7 +++++++ src/CameraCaptureReader.h | 2 ++ src/ScreenCaptureReader.cpp | 10 ++++++++++ src/ScreenCaptureReader.h | 2 ++ tests/CameraCaptureReader.cpp | 10 +++++++--- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/CameraCaptureReader.cpp b/src/CameraCaptureReader.cpp index 4aeeee9d7..d96c1a341 100644 --- a/src/CameraCaptureReader.cpp +++ b/src/CameraCaptureReader.cpp @@ -313,6 +313,13 @@ void CameraCaptureReader::Close() } } +void CameraCaptureReader::RequestClose() +{ + if (reader) { + reader->RequestClose(); + } +} + openshot::CaptureReaderStats CameraCaptureReader::GetStats() const { return reader ? reader->GetStats() : CaptureReaderStats(); diff --git a/src/CameraCaptureReader.h b/src/CameraCaptureReader.h index b19fb4384..4c9e8232a 100644 --- a/src/CameraCaptureReader.h +++ b/src/CameraCaptureReader.h @@ -55,6 +55,8 @@ namespace openshot ~CameraCaptureReader() override; void Close() override; + /// Request cancellation without releasing camera resources on the caller's thread. + void RequestClose(); CacheBase* GetCache() override { return NULL; }; std::shared_ptr GetFrame(int64_t number) override; bool IsOpen() override { return reader && reader->IsOpen(); }; diff --git a/src/ScreenCaptureReader.cpp b/src/ScreenCaptureReader.cpp index 8c6ee32a0..a8e9cd0a3 100644 --- a/src/ScreenCaptureReader.cpp +++ b/src/ScreenCaptureReader.cpp @@ -930,6 +930,11 @@ void ScreenCaptureReader::OpenDevice() } format_context->interrupt_callback.callback = capture_interrupt_callback; format_context->interrupt_callback.opaque = &close_requested; + if (InputFormatName() == "dshow") { + // DirectShow's blocking packet wait does not check the interrupt callback. + // Poll through DecodeNextFrame instead so the owning thread can clean up COM. + format_context->flags |= AVFMT_FLAG_NONBLOCK; + } AVDictionary* options = nullptr; const bool use_device_defaults = settings.options.count("use_device_defaults") > 0; @@ -1192,6 +1197,11 @@ std::shared_ptr ScreenCaptureReader::DecodeNextFrame(int64_t number) throw ReaderClosed("The ScreenCaptureReader was closed."); } +void ScreenCaptureReader::RequestClose() +{ + close_requested = true; +} + void ScreenCaptureReader::Close() { // Signal blocking native reads before waiting for GetFrame(). The FFmpeg diff --git a/src/ScreenCaptureReader.h b/src/ScreenCaptureReader.h index afdff777a..19721ee19 100644 --- a/src/ScreenCaptureReader.h +++ b/src/ScreenCaptureReader.h @@ -79,6 +79,8 @@ namespace openshot ~ScreenCaptureReader() override; void Close() override; + /// Signal FFmpeg capture reads to stop; the opening thread must call Close(). + void RequestClose(); CacheBase* GetCache() override { return NULL; }; std::shared_ptr GetFrame(int64_t number) override; bool IsOpen() override; diff --git a/tests/CameraCaptureReader.cpp b/tests/CameraCaptureReader.cpp index 5eb8335d4..b38acd471 100644 --- a/tests/CameraCaptureReader.cpp +++ b/tests/CameraCaptureReader.cpp @@ -55,7 +55,7 @@ struct CameraOpenGate { thread_local CameraOpenGate* CameraOpenGate::active = nullptr; } -TEST_CASE("Camera close waits for in-flight FFmpeg initialization", +TEST_CASE("Camera cancellation does not clean up in-flight FFmpeg initialization", "[libopenshot][cameracapturereader][lifecycle]") { CameraCaptureSettings settings; @@ -63,6 +63,9 @@ TEST_CASE("Camera close waits for in-flight FFmpeg initialization", // /dev/null is a file, so this path cannot accidentally name a real camera. settings.device = "/dev/null/openshot-test-camera"; CameraCaptureReader reader(settings); + bool request_only = false; + SECTION("Close waits for initialization before freeing resources") {} + SECTION("RequestClose returns without waiting for initialization") { request_only = true; } CameraOpenGate gate; std::exception_ptr open_error; av_log_set_callback(CameraOpenGate::Log); @@ -81,7 +84,8 @@ TEST_CASE("Camera close waits for in-flight FFmpeg initialization", auto done = close_done.get_future(); std::thread closer([&] { close_started.set_value(); - reader.Close(); + if (request_only) reader.RequestClose(); + else reader.Close(); close_done.set_value(); }); close_started.get_future().wait(); @@ -95,7 +99,7 @@ TEST_CASE("Camera close waits for in-flight FFmpeg initialization", closer.join(); av_log_set_callback(av_log_default_callback); REQUIRE(entered); - CHECK(cleanup_waited); + CHECK(cleanup_waited == !request_only); CHECK(open_error != nullptr); CHECK_FALSE(reader.IsOpen()); CHECK_NOTHROW(reader.Close()); From 58033b28fe43384cdd8ffff1cc4f9b18e5386d2f Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 30 Oct 2026 11:53:55 -0500 Subject: [PATCH 4/6] Use FFmpeg 7.1 in runner builds and installer packaging --- .gitlab-ci.yml | 23 +++++++++++++++++------ tests/SphericalMetadata.cpp | 6 +++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3391b613e..1f0dfdc7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ linux-builder: variables: OPENCV_ROOT: /opt/opencv-4.13.0 OpenCV_DIR: /opt/opencv-4.13.0/lib/cmake/opencv4 + FFMPEG_ROOT: /opt/ffmpeg-7.1.3 artifacts: expire_in: 6 months paths: @@ -41,10 +42,15 @@ 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 + - . "$FFMPEG_ROOT/env.sh" + - export FFMPEGDIR="$FFMPEG_ROOT" - 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 -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 "*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 --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 - make install - ctest --output-on-failure -VV - make doc @@ -65,7 +71,7 @@ mac-builder: variables: OPENCV_ROOT: /usr/local/openshot/opencv-4.13.0 OpenCV_DIR: /usr/local/openshot/opencv-4.13.0/lib/cmake/opencv4 - FFMPEGDIR: /usr/local/openshot/ffmpeg-4.4 + FFMPEGDIR: /usr/local/openshot/ffmpeg-7.1.3 artifacts: expire_in: 6 months paths: @@ -81,7 +87,7 @@ 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 -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -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" ../ + - 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" ../ - 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 {} + @@ -111,9 +117,11 @@ windows-builder-x64: - $env:OpenCV_DIR = "$env:OPENCV_ROOT\lib\cmake\opencv4" - $env:Path = "$env:OPENCV_ROOT\x64\mingw\bin;$env:OPENCV_ROOT\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;C:\msys64\usr\local\bin;" + $env:Path; - $env:MSYSTEM = "MINGW64" + - $env:FFMPEGDIR = "C:/msys64/mingw64" + - if ((& "$env:FFMPEGDIR/bin/ffmpeg.exe" -version | Select-Object -First 1) -notmatch "^ffmpeg version 7[.]1[.]") { throw "FFmpeg 7.1 is required" } - ffmpeg -hide_banner -devices | findstr /I "gdigrab" - ffmpeg -hide_banner -devices | findstr /I "dshow" - - cmake -B build -S . -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" -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" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" - cmake --build build --parallel $([Environment]::ProcessorCount) - ctest --test-dir build --output-on-failure -VV - cmake --install build @@ -141,7 +149,7 @@ windows-builder-arm64: - "if ($CI_COMMIT_REF_NAME -eq \"arm64-support\" -and -not (Select-String -Path \"build/install-arm64/share/libopenshot-audio.env\" -Pattern \"^CI_COMMIT_REF_NAME:arm64-support$\" -Quiet)) { throw \"Matching arm64-support audio artifacts are required\" }" - $env:MSYSTEM = "CLANGARM64" - $env:Path = "C:\msys64\clangarm64\bin;C:\msys64\usr\bin;" + $env:Path; - - cmake -B build -S . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_C_COMPILER=clang" -D"CMAKE_CXX_COMPILER=clang++" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-arm64" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-arm64" -D"PYTHON_MODULE_PATH=python" -D"USE_QT6=ON" -D"OPENSHOT_QT_API=pyqt6" -G Ninja -D"CMAKE_BUILD_TYPE:STRING=Release" + - cmake -B build -S . -U "*FFmpeg*" -U "*PC_av*" -U "*PC_sw*" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_C_COMPILER=clang" -D"CMAKE_CXX_COMPILER=clang++" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-arm64" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-arm64" -D"PYTHON_MODULE_PATH=python" -D"USE_QT6=ON" -D"OPENSHOT_QT_API=pyqt6" -G Ninja -D"CMAKE_BUILD_TYPE:STRING=Release" - cmake --build build --parallel $([Environment]::ProcessorCount) - ctest --test-dir build --output-on-failure -VV - cmake --install build @@ -181,10 +189,13 @@ windows-builder-x86: - $env:OpenCV_DIR = "$env:OPENCV_ROOT\lib\cmake\opencv4" - $env:Path = "$env:OPENCV_ROOT\bin;C:\msys64\mingw32\bin;C:\msys64\usr\bin;C:\msys64\usr\local\bin;" + $env:Path; - $env:MSYSTEM = "MINGW32" + - $env:FFMPEGDIR = "C:/msys64/mingw32" + - if ((& "$env:FFMPEGDIR/bin/ffmpeg.exe" -version | Select-Object -First 1) -notmatch "^ffmpeg version 7[.]1[.]") { throw "FFmpeg 7.1 is required" } - ffmpeg -hide_banner -devices | findstr /I "gdigrab" - ffmpeg -hide_banner -devices | findstr /I "dshow" - - cmake -B build -S . -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" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32" + - 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" -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 --build build --parallel $([Environment]::ProcessorCount) + - ctest --test-dir build --output-on-failure -VV - cmake --install build - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value}) - $PROJECT_SO = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_SO_VERSION (.*)\)' | %{$_.Matches.Groups[1].value}) diff --git a/tests/SphericalMetadata.cpp b/tests/SphericalMetadata.cpp index 630a5475c..9227f8907 100644 --- a/tests/SphericalMetadata.cpp +++ b/tests/SphericalMetadata.cpp @@ -93,9 +93,9 @@ static void check_written_orientation(const std::string& path, static bool has_ffmpeg_orientation_bug(float yaw, float pitch, float roll) { const auto major = avformat_version() >> 16; - // libavformat 62 and 63 correspond to FFmpeg 8 and 9. - if ((major == 62 || major == 63) && yaw == 0 && pitch == 0 && roll == 0) { - WARN("Skipping spherical reader angle assertions: FFmpeg 8/9 returned 0,0,0. " + // libavformat 61, 62 and 63 correspond to FFmpeg 7, 8 and 9. + if (major >= 61 && major <= 63 && yaw == 0 && pitch == 0 && roll == 0) { + WARN("Skipping spherical reader angle assertions: FFmpeg 7-9 returned 0,0,0. " "Written MP4 angles were verified independently. Upstream patch submitted " "to ffmpeg-devel: avformat/mov: preserve spherical orientation when reading vexu. " "FFmpeg version: " << av_version_info()); From 509d97b5dbb966119c2c21e59039042cc72d5678 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 30 Oct 2026 12:26:54 -0500 Subject: [PATCH 5/6] Fix Windows dependency paths and stabilize CI autogen --- .gitlab-ci.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f0dfdc7e..7a30fe4de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,14 +115,17 @@ windows-builder-x64: - "if ($CI_COMMIT_REF_NAME -eq \"arm64-support\" -and -not (Select-String -Path \"build/install-x64/share/libopenshot-audio.env\" -Pattern \"^CI_COMMIT_REF_NAME:arm64-support$\" -Quiet)) { throw \"Matching arm64-support audio artifacts are required\" }" - $env:OPENCV_ROOT = "C:\msys64\mingw64\opencv-4.13.0" - $env:OpenCV_DIR = "$env:OPENCV_ROOT\lib\cmake\opencv4" - - $env:Path = "$env:OPENCV_ROOT\x64\mingw\bin;$env:OPENCV_ROOT\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;C:\msys64\usr\local\bin;" + $env:Path; + - $env:Path = "$CI_PROJECT_DIR\build\install-x64\bin;$CI_PROJECT_DIR\build\src;$env:OPENCV_ROOT\x64\mingw\bin;$env:OPENCV_ROOT\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;C:\msys64\usr\local\bin;" + $env:Path; - $env:MSYSTEM = "MINGW64" - $env:FFMPEGDIR = "C:/msys64/mingw64" - if ((& "$env:FFMPEGDIR/bin/ffmpeg.exe" -version | Select-Object -First 1) -notmatch "^ffmpeg version 7[.]1[.]") { throw "FFmpeg 7.1 is required" } - 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" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" - - cmake --build build --parallel $([Environment]::ProcessorCount) + - 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 --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" } + - Write-Host "Discovered $(@($testList.tests).Count) unit tests" - ctest --test-dir build --output-on-failure -VV - cmake --install build - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value}) @@ -187,14 +190,17 @@ windows-builder-x86: - "if ($CI_COMMIT_REF_NAME -eq \"arm64-support\" -and -not (Select-String -Path \"build/install-x86/share/libopenshot-audio.env\" -Pattern \"^CI_COMMIT_REF_NAME:arm64-support$\" -Quiet)) { throw \"Matching arm64-support audio artifacts are required\" }" - $env:OPENCV_ROOT = "C:\msys64\mingw32\opencv-4.13.0" - $env:OpenCV_DIR = "$env:OPENCV_ROOT\lib\cmake\opencv4" - - $env:Path = "$env:OPENCV_ROOT\bin;C:\msys64\mingw32\bin;C:\msys64\usr\bin;C:\msys64\usr\local\bin;" + $env:Path; + - $env:Path = "$CI_PROJECT_DIR\build\install-x86\bin;$CI_PROJECT_DIR\build\src;$env:OPENCV_ROOT\x64\mingw\bin;$env:OPENCV_ROOT\bin;C:\msys64\mingw32\bin;C:\msys64\usr\bin;C:\msys64\usr\local\bin;" + $env:Path; - $env:MSYSTEM = "MINGW32" - $env:FFMPEGDIR = "C:/msys64/mingw32" - if ((& "$env:FFMPEGDIR/bin/ffmpeg.exe" -version | Select-Object -First 1) -notmatch "^ffmpeg version 7[.]1[.]") { throw "FFmpeg 7.1 is required" } - 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" -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 --build build --parallel $([Environment]::ProcessorCount) + - 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 --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" } + - Write-Host "Discovered $(@($testList.tests).Count) unit tests" - ctest --test-dir build --output-on-failure -VV - cmake --install build - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value}) From 3cec7608868f3aba8701e9c95bc49d04792fd3c7 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 30 Oct 2026 12:27:32 -0500 Subject: [PATCH 6/6] Print GitLab server version in pipeline setup --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a30fe4de..6a3517b90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ init-builders: tags: - gitlab script: + - echo "GitLab server version $CI_SERVER_VERSION" - send-ci-sqs linux - send-ci-sqs windows