Request 5032 (accepted)

Overview

Request 5032 (accepted)

- Update to version 25.0.1:
* libobs: Update version to 25.0.1
* libobs-winrt: Fix missing parentheses
* UI: Fix memory leak
* Revert "win-capture, libobs: Show names of displays in Display Capture"
* obs-browser: Fix a few crashes
* UI: Fix preview state when minimizing to tray
* UI: Remove unnecessary vertices for preview
* UI: Get actual projector monitor name on windows
* obs-ffmpeg: Make sure to show FFmpeg NVENC on non-windows
* libobs-winrt: Catch more hresult exceptions
* win-capture: Retry with last known window if first fails
* UI: Restart when browser hardware acceleration changed
* libobs-winrt: win-capture: Clean up error handling

Created by boombatower over 4 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio

Submit package home:boombatow...es:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-25.0.0.tar.xz/UI/platform-windows.cpp -> obs-studio-25.0.1.tar.xz/UI/platform-windows.cpp Changed

@@ -19,6 +19,7 @@
 #include <sstream>
 #include "obs-config.h"
 #include "obs-app.hpp"
+#include "qt-wrappers.hpp"
 #include "platform.hpp"
 
 #include <util/windows/win-version.h>
@@ -330,3 +331,86 @@
 	RunOnceMutex rom(h ? new RunOnceMutexData(h) : nullptr);
 	return rom;
 }
+
+struct MonitorData {
+	const wchar_t *id;
+	MONITORINFOEX info;
+	bool found;
+};
+
+static BOOL CALLBACK GetMonitorCallback(HMONITOR monitor, HDC, LPRECT,
+					LPARAM param)
+{
+	MonitorData *data = (MonitorData *)param;
+
+	if (GetMonitorInfoW(monitor, &data->info)) {
+		if (wcscmp(data->info.szDevice, data->id) == 0) {
+			data->found = true;
+			return false;
+		}
+	}
+
+	return true;
+}
+
+#define GENERIC_MONITOR_NAME QStringLiteral("Generic PnP Monitor")
+
+QString GetMonitorName(const QString &id)
+{
+	MonitorData data = {};
+	data.id = (const wchar_t *)id.utf16();
+	data.info.cbSize = sizeof(data.info);
+
+	EnumDisplayMonitors(nullptr, nullptr, GetMonitorCallback,
+			    (LPARAM)&data);
+	if (!data.found) {
+		return GENERIC_MONITOR_NAME;
+	}
+
+	UINT32 numPath, numMode;
+	if (!GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &numPath,
+					 &numMode) == ERROR_SUCCESS) {
+		return GENERIC_MONITOR_NAME;
+	}
+
+	std::vector<DISPLAYCONFIG_PATH_INFO> paths(numPath);
+	std::vector<DISPLAYCONFIG_MODE_INFO> modes(numMode);
+
+	if (!QueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &numPath, paths.data(),
+				&numMode, modes.data(),
+				nullptr) == ERROR_SUCCESS) {
+		return GENERIC_MONITOR_NAME;
+	}
+
+	DISPLAYCONFIG_TARGET_DEVICE_NAME target;
+	bool found = false;
+
+	paths.resize(numPath);
+	for (size_t i = 0; i < numPath; ++i) {
+		const DISPLAYCONFIG_PATH_INFO &path = paths[i];
+
+		DISPLAYCONFIG_SOURCE_DEVICE_NAME s;
+		s.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME;
+		s.header.size = sizeof(s);
+		s.header.adapterId = path.sourceInfo.adapterId;
+		s.header.id = path.sourceInfo.id;
+
+		if (DisplayConfigGetDeviceInfo(&s.header) == ERROR_SUCCESS &&
+		    wcscmp(data.info.szDevice, s.viewGdiDeviceName) == 0) {
+			target.header.type =
+				DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;
+			target.header.size = sizeof(target);
+			target.header.adapterId = path.sourceInfo.adapterId;
+			target.header.id = path.targetInfo.id;
+			found = DisplayConfigGetDeviceInfo(&target.header) ==
+				ERROR_SUCCESS;
+			break;
+		}
+	}
+
+	if (!found) {
+		return GENERIC_MONITOR_NAME;
+	}
+
+	return QString::fromWCharArray(target.monitorFriendlyDeviceName);
+}

obs-studio-25.0.0.tar.xz/UI/platform.hpp -> obs-studio-25.0.1.tar.xz/UI/platform.hpp Changed

obs-studio-25.0.0.tar.xz/UI/window-basic-main-scene-collections.cpp -> obs-studio-25.0.1.tar.xz/UI/window-basic-main-scene-collections.cpp Changed

obs-studio-25.0.0.tar.xz/UI/window-basic-main.cpp -> obs-studio-25.0.1.tar.xz/UI/window-basic-main.cpp Changed

@@ -29,6 +29,7 @@
 #include <QColorDialog>
 #include <QSizePolicy>
 #include <QScrollBar>
+#include <QTextStream>
 
 #include <util/dstr.h>
 #include <util/util.hpp>
@@ -1451,9 +1452,8 @@
 	gs_render_start(true);
 	gs_vertex2f(0.0f, 0.0f);
 	gs_vertex2f(0.0f, 1.0f);
-	gs_vertex2f(1.0f, 1.0f);
 	gs_vertex2f(1.0f, 0.0f);
-	gs_vertex2f(0.0f, 0.0f);
+	gs_vertex2f(1.0f, 1.0f);
 	box = gs_render_save();
 
 	gs_render_start(true);
@@ -4173,15 +4173,11 @@
 		QRect screenGeometry = screen->geometry();
 		QString name = "";
 #ifdef _WIN32
-		DISPLAY_DEVICE ddev;
-		ddev.cb = sizeof(ddev);
-		BPtr<wchar_t> wideName;
-		os_utf8_to_wcs_ptr(screen->name().toStdString().c_str(), 0,
-				   &wideName);
-		EnumDisplayDevices(wideName, 0, &ddev, 1);
-		BPtr<char> newName;
-		os_wcs_to_utf8_ptr(ddev.DeviceString, 0, &newName);
-		name = newName;
+		QTextStream fullname(&name);
+		fullname << GetMonitorName(screen->name());
+		fullname << " (";
+		fullname << (i + 1);
+		fullname << ")";
 #elif defined(__APPLE__)
 		name = screen->name();
 #elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
@@ -7184,8 +7180,10 @@
 	AddProjectorMenuMonitors(studioProgramProjector, this,
 				 SLOT(OpenStudioProgramProjector()));
 
-	if (reason == QSystemTrayIcon::Trigger)
+	if (reason == QSystemTrayIcon::Trigger) {
+		EnablePreviewDisplay(previewEnabled && !isVisible());
 		ToggleShowHide();
+	}
 }
 
 void OBSBasic::SysTrayNotify(const QString &text,

obs-studio-25.0.0.tar.xz/UI/window-basic-preview.cpp -> obs-studio-25.0.1.tar.xz/UI/window-basic-preview.cpp Changed

@@ -1514,10 +1514,9 @@
 	gs_vertex2f(x1, y1);
 	gs_vertex2f(x1 + (xSide * (thickness / scale.x)),
 		    y1 + (ySide * (thickness / scale.y)));
+	gs_vertex2f(x2, y2);
 	gs_vertex2f(x2 + (xSide * (thickness / scale.x)),
 		    y2 + (ySide * (thickness / scale.y)));
-	gs_vertex2f(x2, y2);
-	gs_vertex2f(x1, y1);
 
 	gs_vertbuffer_t *line = gs_render_save();
 
@@ -1532,24 +1531,17 @@
 
 	gs_vertex2f(0.0f, 0.0f);
 	gs_vertex2f(0.0f + (thickness / scale.x), 0.0f);
-	gs_vertex2f(0.0f + (thickness / scale.x), 1.0f);
-	gs_vertex2f(0.0f, 1.0f);
-	gs_vertex2f(0.0f, 0.0f);
 	gs_vertex2f(0.0f, 1.0f);
+	gs_vertex2f(0.0f + (thickness / scale.x), 1.0f);
 	gs_vertex2f(0.0f, 1.0f - (thickness / scale.y));
-	gs_vertex2f(1.0f, 1.0f - (thickness / scale.y));
-	gs_vertex2f(1.0f, 1.0f);
-	gs_vertex2f(0.0f, 1.0f);
 	gs_vertex2f(1.0f, 1.0f);
+	gs_vertex2f(1.0f, 1.0f - (thickness / scale.y));
 	gs_vertex2f(1.0f - (thickness / scale.x), 1.0f);
-	gs_vertex2f(1.0f - (thickness / scale.x), 0.0f);
-	gs_vertex2f(1.0f, 0.0f);
-	gs_vertex2f(1.0f, 1.0f);
 	gs_vertex2f(1.0f, 0.0f);
+	gs_vertex2f(1.0f - (thickness / scale.x), 0.0f);
 	gs_vertex2f(1.0f, 0.0f + (thickness / scale.y));
-	gs_vertex2f(0.0f, 0.0f + (thickness / scale.y));
 	gs_vertex2f(0.0f, 0.0f);
-	gs_vertex2f(1.0f, 0.0f);
+	gs_vertex2f(0.0f, 0.0f + (thickness / scale.y));
 
 	gs_vertbuffer_t *rect = gs_render_save();
 
@@ -1897,10 +1889,8 @@
 
 			gs_vertex2f(0.0f, 0.0f);
 			gs_vertex2f(1.0f, 0.0f);
-			gs_vertex2f(1.0f, 1.0f);
-			gs_vertex2f(1.0f, 1.0f);
-			gs_vertex2f(0.0f, 0.0f);
 			gs_vertex2f(0.0f, 1.0f);
+			gs_vertex2f(1.0f, 1.0f);
 
 			rectFill = gs_render_save();
 		}

obs-studio-25.0.0.tar.xz/UI/window-basic-settings.cpp -> obs-studio-25.0.1.tar.xz/UI/window-basic-settings.cpp Changed

obs-studio-25.0.0.tar.xz/UI/window-basic-settings.hpp -> obs-studio-25.0.1.tar.xz/UI/window-basic-settings.hpp Changed

obs-studio-25.0.0.tar.xz/libobs-d3d11/d3d11-duplicator.cpp -> obs-studio-25.0.1.tar.xz/libobs-d3d11/d3d11-duplicator.cpp Changed

@@ -16,8 +16,6 @@
 ******************************************************************************/
 
 #include "d3d11-subsystem.hpp"
-#include "util/platform.h"
-#include <map>
 #include <unordered_map>
 
 static inline bool get_monitor(gs_device_t *device, int monitor_idx,
@@ -36,16 +34,6 @@
 	return true;
 }
 
-static inline void get_display_device(DXGI_OUTPUT_DESC *desc,
-				      MONITORINFOEX *moninfo,
-				      DISPLAY_DEVICE *ddev)
-{
-	moninfo->cbSize = sizeof(MONITORINFOEX);
-	GetMonitorInfoW(desc->Monitor, moninfo);
-	ddev->cb = sizeof(*ddev);
-	EnumDisplayDevices(moninfo->szDevice, 0, ddev, 1);
-}
-
 void gs_duplicator::Start()
 {
 	ComPtr<IDXGIOutput1> output1;
@@ -107,10 +95,6 @@
 		return false;
 	}
 
-	DISPLAY_DEVICE ddev;
-	MONITORINFOEX monitorinf;
-	get_display_device(&desc, &monitorinf, &ddev);
-
 	switch (desc.Rotation) {
 	case DXGI_MODE_ROTATION_UNSPECIFIED:
 	case DXGI_MODE_ROTATION_IDENTITY:
@@ -135,17 +119,6 @@
 	info->cx = desc.DesktopCoordinates.right - info->x;
 	info->cy = desc.DesktopCoordinates.bottom - info->y;
 
-	char *devname = NULL;
-#ifdef UNICODE
-	os_wcs_to_utf8_ptr(ddev.DeviceString, 128, &devname);
-#else
-	devname = (char *)bstrdup(ddev.DeviceString);
-#endif
-	info->monitor_name = devname;
-	bfree(devname);
-
-	info->flags = monitorinf.dwFlags;
-
 	return true;
 }

obs-studio-25.0.0.tar.xz/libobs-winrt/winrt-capture.cpp -> obs-studio-25.0.1.tar.xz/libobs-winrt/winrt-capture.cpp Changed

@@ -13,15 +13,19 @@
 };
 
 extern "C" EXPORT BOOL winrt_capture_supported()
-{
-	return winrt::Windows::Foundation::Metadata::ApiInformation::IsTypePresent(
-		       L"Windows.Graphics.Capture.GraphicsCaptureSession") &&
-	       winrt::Windows::Graphics::Capture::GraphicsCaptureSession::
-		       IsSupported();
+try {
+	/* no contract for IGraphicsCaptureItemInterop, verify 10.0.18362.0 */
+	return winrt::Windows::Foundation::Metadata::ApiInformation::
+		IsApiContractPresent(L"Windows.Foundation.UniversalApiContract",
+				     8);
+} catch (winrt::hresult_error &err) {
+	blog(LOG_ERROR, "winrt_capture_supported (0x%08X): %ls", err.to_abi(),
+	     err.message().c_str());
+	return false;
 }
 
 extern "C" EXPORT BOOL winrt_capture_cursor_toggle_supported()
-{
+try {
 #ifdef NTDDI_WIN10_VB
 	return winrt::Windows::Foundation::Metadata::ApiInformation::
 		IsPropertyPresent(
@@ -30,6 +34,10 @@
 #else
 	return false;
 #endif
+} catch (winrt::hresult_error &err) {
+	blog(LOG_ERROR, "winrt_capture_cursor_toggle_supported (0x%08X): %ls",
+	     err.to_abi(), err.message().c_str());
+	return false;
 }
 
 template<typename T>
@@ -125,7 +133,7 @@
 		if (!GetCursorInfo(&ci))
 			return;
 
-		if (!ci.flags & CURSOR_SHOWING)
+		if (!(ci.flags & CURSOR_SHOWING))
 			return;
 
 		HICON icon = CopyIcon(ci.hCursor);
@@ -311,18 +319,14 @@
 thread_local bool initialized_tls;
 
 extern "C" EXPORT struct winrt_capture *
-winrt_capture_init(BOOL cursor, HWND window, BOOL client_area, char **error,
-		   HRESULT *hr_out)
+winrt_capture_init(BOOL cursor, HWND window, BOOL client_area)
 try {
 	ID3D11Device *const d3d_device = (ID3D11Device *)gs_get_device_obj();
 	ComPtr<IDXGIDevice> dxgi_device;
 
-	*error = nullptr;
-
 	HRESULT hr = d3d_device->QueryInterface(&dxgi_device);
 	if (FAILED(hr)) {
-		*error = bstrdup("Failed to get DXGI device");
-		*hr_out = hr;
+		blog(LOG_ERROR, "Failed to get DXGI device");
 		return nullptr;
 	}
 
@@ -330,8 +334,7 @@
 	hr = CreateDirect3D11DeviceFromDXGIDevice(dxgi_device.Get(),
 						  inspectable.put());
 	if (FAILED(hr)) {
-		*error = bstrdup("Failed to get WinRT device");
-		*hr_out = hr;
+		blog(LOG_ERROR, "Failed to get WinRT device");
 		return nullptr;
 	}
 
@@ -347,8 +350,8 @@
 					       IGraphicsCaptureItem>(),
 			reinterpret_cast<void **>(winrt::put_abi(item)));
 	} catch (winrt::hresult_error &err) {
-		*error = bstrdup("CreateForWindow failed");
-		*hr_out = err.code();
+		blog(LOG_ERROR, "CreateForWindow (0x%08X): %ls", err.to_abi(),
+		     err.message().c_str());
 		return nullptr;
 	}
 
@@ -404,8 +407,8 @@
 	return capture;
 
 } catch (winrt::hresult_error &err) {
-	*error = bstrdup("oh wow something else in winrt_capture_init failed");
-	*hr_out = err.code();
+	blog(LOG_ERROR, "winrt_capture_init (0x%08X): %ls", err.to_abi(),
+	     err.message().c_str());
 	return nullptr;
 }

obs-studio-25.0.0.tar.xz/libobs-winrt/winrt-capture.h -> obs-studio-25.0.1.tar.xz/libobs-winrt/winrt-capture.h Changed

obs-studio-25.0.0.tar.xz/libobs/graphics/graphics.h -> obs-studio-25.0.1.tar.xz/libobs/graphics/graphics.h Changed

obs-studio-25.0.0.tar.xz/libobs/obs-config.h -> obs-studio-25.0.1.tar.xz/libobs/obs-config.h Changed

obs-studio-25.0.0.tar.xz/plugins/obs-browser/browser-client.cpp -> obs-studio-25.0.1.tar.xz/plugins/obs-browser/browser-client.cpp Changed

obs-studio-25.0.0.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-25.0.1.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-25.0.0.tar.xz/plugins/obs-browser/obs-browser-source.cpp -> obs-studio-25.0.1.tar.xz/plugins/obs-browser/obs-browser-source.cpp Changed

obs-studio-25.0.0.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c -> obs-studio-25.0.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c Changed

obs-studio-25.0.0.tar.xz/plugins/win-capture/duplicator-monitor-capture.c -> obs-studio-25.0.1.tar.xz/plugins/win-capture/duplicator-monitor-capture.c Changed

obs-studio-25.0.0.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-25.0.1.tar.xz/plugins/win-capture/game-capture.c Changed

obs-studio-25.0.0.tar.xz/plugins/win-capture/monitor-capture.c -> obs-studio-25.0.1.tar.xz/plugins/win-capture/monitor-capture.c Changed

@@ -1,5 +1,4 @@
 #include <util/dstr.h>
-#include <util/platform.h>
 #include "dc-capture.h"
 
 /* clang-format off */
@@ -177,7 +176,7 @@
 	UNUSED_PARAMETER(rect);
 
 	obs_property_t *monitor_list = (obs_property_t *)param;
-	MONITORINFOEX mi;
+	MONITORINFO mi;
 	size_t monitor_id = 0;
 	struct dstr monitor_desc = {0};
 	struct dstr resolution = {0};
@@ -188,40 +187,18 @@
 	mi.cbSize = sizeof(mi);
 	GetMonitorInfo(handle, &mi);
 
-	DISPLAY_DEVICE ddev;
-	ddev.cb = sizeof(ddev);
-	EnumDisplayDevices(mi.szDevice, 0, &ddev, 1);
-
-	char *devname = NULL;
-#ifdef UNICODE
-	os_wcs_to_utf8_ptr(ddev.DeviceString, 128, &devname);
-#else
-	devname = (char *)bstrdup(ddev.DeviceString);
-#endif
-
 	dstr_catf(&resolution, "%dx%d @ %d,%d",
 		  mi.rcMonitor.right - mi.rcMonitor.left,
 		  mi.rcMonitor.bottom - mi.rcMonitor.top, mi.rcMonitor.left,
 		  mi.rcMonitor.top);
 
-	dstr_copy(&format_string, "%s: %s");
+	dstr_copy(&format_string, "%s %d: %s");
 	if (mi.dwFlags == MONITORINFOF_PRIMARY) {
 		dstr_catf(&format_string, " (%s)", TEXT_PRIMARY_MONITOR);
 	}
 
-	struct dstr m = {0};
-	dstr_copy(&m, devname);
-	dstr_replace(&m, "(", " (");
-	if (dstr_is_empty(&m)) {
-		struct dstr d = {0};
-		dstr_catf(&d, "%s %d", TEXT_MONITOR, monitor_id + 1);
-		dstr_free(&m);
-		dstr_copy_dstr(&m, &d);
-		dstr_free(&d);
-	}
-
-	dstr_catf(&monitor_desc, format_string.array, m.array,
-		  resolution.array);
+	dstr_catf(&monitor_desc, format_string.array, TEXT_MONITOR,
+		  monitor_id + 1, resolution.array);
 
 	obs_property_list_add_int(monitor_list, monitor_desc.array,
 				  (int)monitor_id);
@@ -229,8 +206,6 @@
 	dstr_free(&monitor_desc);
 	dstr_free(&resolution);
 	dstr_free(&format_string);
-	dstr_free(&m);
-	bfree(devname);
 
 	return TRUE;
 }

obs-studio-25.0.0.tar.xz/plugins/win-capture/window-capture.c -> obs-studio-25.0.1.tar.xz/plugins/win-capture/window-capture.c Changed

@@ -29,8 +29,7 @@
 	BOOL *(*winrt_capture_supported)();
 	BOOL *(*winrt_capture_cursor_toggle_supported)();
 	struct winrt_capture *(*winrt_capture_init)(BOOL cursor, HWND window,
-						    BOOL client_area,
-						    char **error, HRESULT *hr);
+						    BOOL client_area);
 	void (*winrt_capture_free)(struct winrt_capture *capture);
 	void (*winrt_capture_show_cursor)(struct winrt_capture *capture,
 					  BOOL visible);
@@ -247,6 +246,8 @@
 	/* forces a reset */
 	wc->window = NULL;
 	wc->check_window_timer = WC_CHECK_TIMER;
+
+	wc->previously_failed = false;
 }
 
 static uint32_t wc_width(void *data)
@@ -480,24 +481,16 @@
 		dc_capture_capture(&wc->capture, wc->window);
 	} else if (wc->method == METHOD_WGC) {
 		if (wc->window && (wc->capture_winrt == NULL)) {
-			char *error = NULL;
-			HRESULT hr;
-
-			wc->capture_winrt = wc->exports.winrt_capture_init(
-				wc->cursor, wc->window, wc->client_area, &error,
-				&hr);
-
-			if (!wc->capture_winrt && !wc->previously_failed) {
-				blog(LOG_WARNING,
-				     "%s: winrt_capture_init failed: %s: %lX",
-				     obs_source_get_name(wc->source), error,
-				     hr);
-				wc->previously_failed = true;
-			} else if (wc->capture_winrt) {
-				wc->previously_failed = false;
+			if (!wc->previously_failed) {
+				wc->capture_winrt =
+					wc->exports.winrt_capture_init(
+						wc->cursor, wc->window,
+						wc->client_area);
+
+				if (!wc->capture_winrt) {
+					wc->previously_failed = true;
+				}
 			}
-
-			bfree(error);
 		}
 	}

Build Results
RPM Lint

Refresh

Comments for request 5032 0

Request History

boombatower created request over 4 years ago

boombatower accepted request over 4 years ago