Skip to content

libobs-winrt: Prevent hard cap of 60 fps for WGC capture #12759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libobs-winrt: Prevent hard cap of 60 fps for WGC capture #12759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions libobs-winrt/winrt-capture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "winrt-capture.h"

#if defined(WDK_NTDDI_VERSION) && (WDK_NTDDI_VERSION >= 0x0A000010)
#define WINRT_MIN_UPDATE_INTERVAL
#endif

extern "C" EXPORT BOOL winrt_capture_supported()
try {
/* no contract for IGraphicsCaptureItemInterop, verify 10.0.18362.0 */
Expand Down Expand Up @@ -27,6 +31,18 @@ try {
return false;
}

#ifdef WINRT_MIN_UPDATE_INTERVAL
static inline winrt::Windows::Foundation::TimeSpan calculate_min_interval()
{
obs_video_info ovi{};
if (!obs_get_video_info(&ovi) || !ovi.fps_num)
return winrt::Windows::Foundation::TimeSpan{0};

const uint64_t frame_interval_hns = util_mul_div64(ovi.fps_den, 10000000ULL, ovi.fps_num);
return winrt::Windows::Foundation::TimeSpan{static_cast<int64_t>(frame_interval_hns / 2)};
}
#endif

template<typename T>
static winrt::com_ptr<T> GetDXGIInterfaceFromObject(winrt::Windows::Foundation::IInspectable const &object)
{
Expand Down Expand Up @@ -306,6 +322,18 @@ static void winrt_capture_device_loss_rebuild(void *device_void, void *data)
capture->last_size);
const winrt::Windows::Graphics::Capture::GraphicsCaptureSession session = frame_pool.CreateCaptureSession(item);

#ifdef WINRT_MIN_UPDATE_INTERVAL
if (winrt::Windows::Foundation::Metadata::ApiInformation::IsPropertyPresent(
L"Windows.Graphics.Capture.GraphicsCaptureSession", L"MinUpdateInterval")) {
try {
session.MinUpdateInterval(calculate_min_interval());
} catch (const winrt::hresult_error &err) {
blog(LOG_WARNING, "GraphicsCaptureSession::MinUpdateInterval (0x%08X): %s", err.code().value,
winrt::to_string(err.message()).c_str());
}
}
#endif

if (winrt_capture_border_toggle_supported()) {
winrt::Windows::Graphics::Capture::GraphicsCaptureAccess::RequestAccessAsync(
winrt::Windows::Graphics::Capture::GraphicsCaptureAccessKind::Borderless)
Expand Down Expand Up @@ -370,6 +398,18 @@ try {
device, static_cast<winrt::Windows::Graphics::DirectX::DirectXPixelFormat>(format), 2, size);
const winrt::Windows::Graphics::Capture::GraphicsCaptureSession session = frame_pool.CreateCaptureSession(item);

#ifdef WINRT_MIN_UPDATE_INTERVAL
if (winrt::Windows::Foundation::Metadata::ApiInformation::IsPropertyPresent(
L"Windows.Graphics.Capture.GraphicsCaptureSession", L"MinUpdateInterval")) {
try {
session.MinUpdateInterval(calculate_min_interval());
} catch (const winrt::hresult_error &err) {
blog(LOG_WARNING, "GraphicsCaptureSession::MinUpdateInterval (0x%08X): %s", err.code().value,
winrt::to_string(err.message()).c_str());
}
}
#endif

if (winrt_capture_border_toggle_supported()) {
winrt::Windows::Graphics::Capture::GraphicsCaptureAccess::RequestAccessAsync(
winrt::Windows::Graphics::Capture::GraphicsCaptureAccessKind::Borderless)
Expand Down