Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 28 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ init-builders:
tags:
- gitlab
script:
- echo "GitLab server version $CI_SERVER_VERSION"
- send-ci-sqs linux
- send-ci-sqs windows

Expand All @@ -25,6 +26,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:
Expand All @@ -41,10 +43,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
Expand All @@ -65,7 +72,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:
Expand All @@ -81,7 +88,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 {} +
Expand Down Expand Up @@ -109,12 +116,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 . -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})
Expand All @@ -141,7 +153,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
Expand Down Expand Up @@ -179,12 +191,18 @@ 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 . -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 --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})
- $PROJECT_SO = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_SO_VERSION (.*)\)' | %{$_.Matches.Groups[1].value})
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ 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.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}")
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 7 additions & 0 deletions src/CameraCaptureReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@ void CameraCaptureReader::Close()
}
}

void CameraCaptureReader::RequestClose()
{
if (reader) {
reader->RequestClose();
}
}

openshot::CaptureReaderStats CameraCaptureReader::GetStats() const
{
return reader ? reader->GetStats() : CaptureReaderStats();
Expand Down
2 changes: 2 additions & 0 deletions src/CameraCaptureReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<openshot::Frame> GetFrame(int64_t number) override;
bool IsOpen() override { return reader && reader->IsOpen(); };
Expand Down
14 changes: 14 additions & 0 deletions src/FFmpegReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions src/FFmpegReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions src/ScreenCaptureReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1192,6 +1197,11 @@ std::shared_ptr<Frame> 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
Expand Down
2 changes: 2 additions & 0 deletions src/ScreenCaptureReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<openshot::Frame> GetFrame(int64_t number) override;
bool IsOpen() override;
Expand Down
10 changes: 7 additions & 3 deletions tests/CameraCaptureReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,17 @@ 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;
settings.backend = CAMERA_CAPTURE_V4L2;
// /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);
Expand All @@ -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();
Expand All @@ -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());
Expand Down
Loading
Loading