Request 4595 (accepted)

Overview

Request 4595 (accepted)

- Update to version 24.0.3:
* obs-browser: Remove "monitor by default" flag
* Revert "libobs/audio-monitoring: Don't init until used"
* libobs-d3d11: Fix code styling
* libobs: Update version to 24.0.3
* libobs-d3d11: Fix calling convention of loaded func
* obs-browser: Only disable NetworkService on macOS
* libobs-d3d11: Use unordered_map for duplicator collection
* win-capture: Fix extra duplicator refs
* UI: Fix issue where multiview doesn't update
* libobs: Update version to 24.0.2
* libobs-d3d11: Don't set GPU priority on Intel adapters
* libobs/audio-monitoring: Add error logging
* libobs/audio-monitoring: Don't init until used
* obs-browser: Use older chromium network implementation
* libobs-d3d11: Set maximum GPU priority
* Exclude build dir from clang format
* UI, libobs: Fix compiler warnings
* Revert "UI: Remove FFZ from twitch integration"
* UI: Remove FFZ from twitch integration
* libobs-d3d11: Disable NV12 format support for WARP
* obs-ffmpeg: Remove unbuffered mode from media source
* obs-transitions: Fix stingers sometimes getting cut off
* obs-browser: Update version to 2.7.12
* obs-ffmpeg: Fix deadlock with nvenc lookahead
* UI: Fix path calculation for disk space check
* obs-ffmpeg: Do not enable hardware decoding by default

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

@@ -1,4 +1,35 @@
 -------------------------------------------------------------------
+Tue Oct 15 14:33:53 UTC 2019 - jimmy@boombatower.com
+
+- Update to version 24.0.3:
+  * obs-browser: Remove "monitor by default" flag
+  * Revert "libobs/audio-monitoring: Don't init until used"
+  * libobs-d3d11: Fix code styling
+  * libobs: Update version to 24.0.3
+  * libobs-d3d11: Fix calling convention of loaded func
+  * obs-browser: Only disable NetworkService on macOS
+  * libobs-d3d11: Use unordered_map for duplicator collection
+  * win-capture: Fix extra duplicator refs
+  * UI: Fix issue where multiview doesn't update
+  * libobs: Update version to 24.0.2
+  * libobs-d3d11: Don't set GPU priority on Intel adapters
+  * libobs/audio-monitoring: Add error logging
+  * libobs/audio-monitoring: Don't init until used
+  * obs-browser: Use older chromium network implementation
+  * libobs-d3d11: Set maximum GPU priority
+  * Exclude build dir from clang format
+  * UI, libobs: Fix compiler warnings
+  * Revert "UI: Remove FFZ from twitch integration"
+  * UI: Remove FFZ from twitch integration
+  * libobs-d3d11: Disable NV12 format support for WARP
+  * obs-ffmpeg: Remove unbuffered mode from media source
+  * obs-transitions: Fix stingers sometimes getting cut off
+  * obs-browser: Update version to 2.7.12
+  * obs-ffmpeg: Fix deadlock with nvenc lookahead
+  * UI: Fix path calculation for disk space check
+  * obs-ffmpeg: Do not enable hardware decoding by default
+
+-------------------------------------------------------------------
 Sun Sep 22 21:04:42 UTC 2019 - jimmy@boombatower.com
 
 - Update to version 24.0.1:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-24.0.1.tar.xz/UI/obs-app.cpp -> obs-studio-24.0.3.tar.xz/UI/obs-app.cpp Changed

obs-studio-24.0.1.tar.xz/UI/window-basic-main.cpp -> obs-studio-24.0.3.tar.xz/UI/window-basic-main.cpp Changed

@@ -392,6 +392,12 @@
 		SLOT(PreviewDisabledMenu(const QPoint &)));
 	connect(ui->enablePreviewButton, SIGNAL(clicked()), this,
 		SLOT(TogglePreview()));
+
+	connect(ui->scenes->model(),
+		SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)),
+		this,
+		SLOT(ScenesReordered(const QModelIndex &, int, int,
+				     const QModelIndex &, int)));
 }
 
 static void SaveAudioDevice(const char *name, int channel, obs_data_t *parent,
@@ -7548,6 +7554,29 @@
 #define MBYTES_LEFT_STOP_REC 50ULL
 #define MAX_BYTES_LEFT (MBYTES_LEFT_STOP_REC * MBYTE)
 
+const char *OBSBasic::GetCurrentOutputPath()
+{
+	const char *path = nullptr;
+	const char *mode = config_get_string(Config(), "Output", "Mode");
+
+	if (strcmp(mode, "Advanced") == 0) {
+		const char *advanced_mode =
+			config_get_string(Config(), "AdvOut", "RecType");
+
+		if (strcmp(advanced_mode, "FFmpeg") == 0) {
+			path = config_get_string(Config(), "AdvOut",
+						 "FFFilePath");
+		} else {
+			path = config_get_string(Config(), "AdvOut",
+						 "RecFilePath");
+		}
+	} else {
+		path = config_get_string(Config(), "SimpleOutput", "FilePath");
+	}
+
+	return path;
+}
+
 void OBSBasic::DiskSpaceMessage()
 {
 	blog(LOG_ERROR, "Recording stopped because of low disk space");
@@ -7558,12 +7587,11 @@
 
 bool OBSBasic::LowDiskSpace()
 {
-	const char *mode = config_get_string(Config(), "Output", "Mode");
-	const char *path =
-		strcmp(mode, "Advanced")
-			? config_get_string(Config(), "SimpleOutput",
-					    "FilePath")
-			: config_get_string(Config(), "AdvOut", "RecFilePath");
+	const char *path;
+
+	path = GetCurrentOutputPath();
+	if (!path)
+		return false;
 
 	uint64_t num_bytes = os_get_free_disk_space(path);
 
@@ -7582,3 +7610,15 @@
 		DiskSpaceMessage();
 	}
 }
+
+void OBSBasic::ScenesReordered(const QModelIndex &parent, int start, int end,
+			       const QModelIndex &destination, int row)
+{
+	UNUSED_PARAMETER(parent);
+	UNUSED_PARAMETER(start);
+	UNUSED_PARAMETER(end);
+	UNUSED_PARAMETER(destination);
+	UNUSED_PARAMETER(row);
+
+	OBSProjector::UpdateMultiviewProjectors();
+}

obs-studio-24.0.1.tar.xz/UI/window-basic-main.hpp -> obs-studio-24.0.3.tar.xz/UI/window-basic-main.hpp Changed

obs-studio-24.0.1.tar.xz/UI/window-basic-preview.cpp -> obs-studio-24.0.3.tar.xz/UI/window-basic-preview.cpp Changed

obs-studio-24.0.1.tar.xz/UI/window-basic-stats.cpp -> obs-studio-24.0.3.tar.xz/UI/window-basic-stats.cpp Changed

obs-studio-24.0.1.tar.xz/formatcode.sh -> obs-studio-24.0.3.tar.xz/formatcode.sh Changed

obs-studio-24.0.1.tar.xz/libobs-d3d11/CMakeLists.txt -> obs-studio-24.0.3.tar.xz/libobs-d3d11/CMakeLists.txt Changed

obs-studio-24.0.3.tar.xz/libobs-d3d11/d3d11-config.h.in Added

obs-studio-24.0.1.tar.xz/libobs-d3d11/d3d11-duplicator.cpp -> obs-studio-24.0.3.tar.xz/libobs-d3d11/d3d11-duplicator.cpp Changed

obs-studio-24.0.1.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-24.0.3.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

@@ -21,8 +21,10 @@
 #include <util/dstr.h>
 #include <util/util.hpp>
 #include <graphics/matrix3.h>
+#include <winternl.h>
 #include <d3d9.h>
 #include "d3d11-subsystem.hpp"
+#include "d3d11-config.h"
 
 struct UnsupportedHWError : HRError {
 	inline UnsupportedHWError(const char *str, HRESULT hr)
@@ -351,6 +353,63 @@
 	return false;
 }
 
+#if USE_GPU_PRIORITY
+static bool set_priority(ID3D11Device *device)
+{
+	typedef enum _D3DKMT_SCHEDULINGPRIORITYCLASS {
+		D3DKMT_SCHEDULINGPRIORITYCLASS_IDLE,
+		D3DKMT_SCHEDULINGPRIORITYCLASS_BELOW_NORMAL,
+		D3DKMT_SCHEDULINGPRIORITYCLASS_NORMAL,
+		D3DKMT_SCHEDULINGPRIORITYCLASS_ABOVE_NORMAL,
+		D3DKMT_SCHEDULINGPRIORITYCLASS_HIGH,
+		D3DKMT_SCHEDULINGPRIORITYCLASS_REALTIME
+	} D3DKMT_SCHEDULINGPRIORITYCLASS;
+
+	ComQIPtr<IDXGIDevice> dxgiDevice(device);
+	if (!dxgiDevice) {
+		blog(LOG_DEBUG, "%s: Failed to get IDXGIDevice", __FUNCTION__);
+		return false;
+	}
+
+	HMODULE gdi32 = GetModuleHandleW(L"GDI32");
+	if (!gdi32) {
+		blog(LOG_DEBUG, "%s: Failed to get GDI32", __FUNCTION__);
+		return false;
+	}
+
+	NTSTATUS(WINAPI * d3dkmt_spspc)(HANDLE, D3DKMT_SCHEDULINGPRIORITYCLASS);
+	d3dkmt_spspc = (decltype(d3dkmt_spspc))GetProcAddress(
+		gdi32, "D3DKMTSetProcessSchedulingPriorityClass");
+	if (!d3dkmt_spspc) {
+		blog(LOG_DEBUG, "%s: Failed to get d3dkmt_spspc", __FUNCTION__);
+		return false;
+	}
+
+	NTSTATUS status = d3dkmt_spspc(GetCurrentProcess(),
+				       D3DKMT_SCHEDULINGPRIORITYCLASS_REALTIME);
+	if (status != 0) {
+		blog(LOG_DEBUG, "%s: Failed to set process priority class: %d",
+		     __FUNCTION__, (int)status);
+		return false;
+	}
+
+	HRESULT hr = dxgiDevice->SetGPUThreadPriority(GPU_PRIORITY_VAL);
+	if (FAILED(hr)) {
+		blog(LOG_DEBUG, "%s: SetGPUThreadPriority failed",
+		     __FUNCTION__);
+		return false;
+	}
+
+	blog(LOG_INFO, "D3D11 GPU priority setup success");
+	return true;
+}
+
+static bool is_intel(const wstring &name)
+{
+	return wstrstri(name.c_str(), L"intel") != nullptr;
+}
+#endif
+
 void gs_device::InitDevice(uint32_t adapterIdx)
 {
 	wstring adapterName;
@@ -385,11 +444,24 @@
 	blog(LOG_INFO, "D3D11 loaded successfully, feature level used: %x",
 	     (unsigned int)levelUsed);
 
+	/* adjust gpu thread priority */
+#if USE_GPU_PRIORITY
+	if (!is_intel(adapterName) && !set_priority(device)) {
+		blog(LOG_INFO, "D3D11 GPU priority setup "
+			       "failed (not admin?)");
+	}
+#endif
+
 	/* ---------------------------------------- */
 	/* check for nv12 texture output support    */
 
 	nv12Supported = false;
 
+	/* WARP NV12 support is suspected to be buggy on older Windows */
+	if (desc.VendorId == 0x1414 && desc.DeviceId == 0x8c) {
+		return;
+	}
+
 	/* Intel CopyResource is very slow with NV12 */
 	if (desc.VendorId == 0x8086) {
 		return;

obs-studio-24.0.1.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c -> obs-studio-24.0.3.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c Changed

@@ -10,6 +10,14 @@
 	EXTERN_C const GUID DECLSPEC_SELECTANY name = {                       \
 		l, w1, w2, {b1, b2, b3, b4, b5, b6, b7, b8}}
 
+#define do_log(level, format, ...)                      \
+	blog(level, "[audio monitoring: '%s'] " format, \
+	     obs_source_get_name(monitor->source), ##__VA_ARGS__)
+
+#define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
+#define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
+#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
+
 ACTUALLY_DEFINE_GUID(CLSID_MMDeviceEnumerator, 0xBCDE0395, 0xE52F, 0x467C, 0x8E,
 		     0x3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E);
 ACTUALLY_DEFINE_GUID(IID_IMMDeviceEnumerator, 0xA95664D2, 0x9614, 0x4F35, 0xA7,
@@ -256,6 +264,7 @@
 
 	const char *id = obs->audio.monitoring_device_id;
 	if (!id) {
+		warn("%s: No device ID set", __FUNCTION__);
 		return false;
 	}
 
@@ -277,6 +286,8 @@
 	hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
 			      &IID_IMMDeviceEnumerator, (void **)&immde);
 	if (FAILED(hr)) {
+		warn("%s: Failed to create IMMDeviceEnumerator: %08lX",
+		     __FUNCTION__, hr);
 		return false;
 	}
 
@@ -291,6 +302,7 @@
 	}
 
 	if (FAILED(hr)) {
+		warn("%s: Failed to get device: %08lX", __FUNCTION__, hr);
 		goto fail;
 	}
 
@@ -301,11 +313,13 @@
 					       &IID_IAudioClient, CLSCTX_ALL,
 					       NULL, (void **)&monitor->client);
 	if (FAILED(hr)) {
+		warn("%s: Failed to activate device: %08lX", __FUNCTION__, hr);
 		goto fail;
 	}
 
 	hr = monitor->client->lpVtbl->GetMixFormat(monitor->client, &wfex);
 	if (FAILED(hr)) {
+		warn("%s: Failed to get mix format: %08lX", __FUNCTION__, hr);
 		goto fail;
 	}
 
@@ -313,6 +327,7 @@
 						 AUDCLNT_SHAREMODE_SHARED, 0,
 						 10000000, 0, wfex, NULL);
 	if (FAILED(hr)) {
+		warn("%s: Failed to initialize: %08lX", __FUNCTION__, hr);
 		goto fail;
 	}
 
@@ -346,6 +361,7 @@
 
 	hr = monitor->client->lpVtbl->GetBufferSize(monitor->client, &frames);
 	if (FAILED(hr)) {
+		warn("%s: Failed to get buffer size: %08lX", __FUNCTION__, hr);
 		goto fail;
 	}
 
@@ -353,15 +369,19 @@
 						 &IID_IAudioRenderClient,
 						 (void **)&monitor->render);
 	if (FAILED(hr)) {
+		warn("%s: Failed to get IAudioRenderClient: %08lX",
+		     __FUNCTION__, hr);
 		goto fail;
 	}
 
 	if (pthread_mutex_init(&monitor->playback_mutex, NULL) != 0) {
+		warn("%s: Failed to initialize mutex", __FUNCTION__);
 		goto fail;
 	}
 
 	hr = monitor->client->lpVtbl->Start(monitor->client);
 	if (FAILED(hr)) {
+		warn("%s: Failed to start audio: %08lX", __FUNCTION__, hr);
 		goto fail;
 	}

obs-studio-24.0.1.tar.xz/libobs/obs-config.h -> obs-studio-24.0.3.tar.xz/libobs/obs-config.h Changed

obs-studio-24.0.1.tar.xz/libobs/obs.c -> obs-studio-24.0.3.tar.xz/libobs/obs.c Changed

obs-studio-24.0.1.tar.xz/plugins/obs-browser/README.md -> obs-studio-24.0.3.tar.xz/plugins/obs-browser/README.md Changed

obs-studio-24.0.1.tar.xz/plugins/obs-browser/browser-app.cpp -> obs-studio-24.0.3.tar.xz/plugins/obs-browser/browser-app.cpp Changed

obs-studio-24.0.1.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-24.0.3.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-24.0.1.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp -> obs-studio-24.0.3.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp Changed

obs-studio-24.0.1.tar.xz/plugins/obs-browser/obs-browser-source-audio.cpp -> obs-studio-24.0.3.tar.xz/plugins/obs-browser/obs-browser-source-audio.cpp Changed

obs-studio-24.0.1.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c -> obs-studio-24.0.3.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c Changed

obs-studio-24.0.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c -> obs-studio-24.0.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c Changed

obs-studio-24.0.1.tar.xz/plugins/obs-transitions/transition-stinger.c -> obs-studio-24.0.3.tar.xz/plugins/obs-transitions/transition-stinger.c Changed

obs-studio-24.0.1.tar.xz/plugins/win-capture/duplicator-monitor-capture.c -> obs-studio-24.0.3.tar.xz/plugins/win-capture/duplicator-monitor-capture.c Changed

Build Results
RPM Lint

Refresh

Comments for request 4595 0

Request History

boombatower created request over 4 years ago

boombatower accepted request over 4 years ago