Request 4450 (accepted)

Overview

Request 4450 (accepted)

- Update to version 23.0.1:
* obs-browser: Fix widgets being initially blank on high-DPI
* libobs: Update version to 23.0.1
* libobs-d3d11: Disable NV12 textures if NVENC unavailable
* UI: Don't show "What's New" for new users
* UI: Don't delete auto-remux file (just in case)
* libobs-d3d11: Blacklist certain adapters from NV12
* UI: Do not allow post-GPU rescaling on gpu encoders
* libobs: Add func to get encoder caps by encoder pointer
* obs-ffmpeg: Fix bitrate being set on NVENC CQP/lossless
* UI: Fix Mixer allowing endless login retries
* UI: Make workaround for Logitech plugin hard lock
* UI: Check CEF available when loading auth
* libobs-d3d11: Improve check for NV12 texture support

Created by boombatower over 5 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,22 @@
 -------------------------------------------------------------------
+Wed Feb 27 21:36:03 UTC 2019 - jimmy@boombatower.com
+
+- Update to version 23.0.1:
+  * obs-browser: Fix widgets being initially blank on high-DPI
+  * libobs: Update version to 23.0.1
+  * libobs-d3d11: Disable NV12 textures if NVENC unavailable
+  * UI: Don't show "What's New" for new users
+  * UI: Don't delete auto-remux file (just in case)
+  * libobs-d3d11: Blacklist certain adapters from NV12
+  * UI: Do not allow post-GPU rescaling on gpu encoders
+  * libobs: Add func to get encoder caps by encoder pointer
+  * obs-ffmpeg: Fix bitrate being set on NVENC CQP/lossless
+  * UI: Fix Mixer allowing endless login retries
+  * UI: Make workaround for Logitech plugin hard lock
+  * UI: Check CEF available when loading auth
+  * libobs-d3d11: Improve check for NV12 texture support
+
+-------------------------------------------------------------------
 Tue Feb 26 00:11:02 UTC 2019 - Jimmy Berry <jimmy@boombatower.com>
 
 - Include pkg-config (.pc) file in devel subpackage.

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-23.0.0.tar.xz/UI/api-interface.cpp -> obs-studio-23.0.1.tar.xz/UI/api-interface.cpp Changed

@@ -20,6 +20,10 @@
 void EnumProfiles(function<bool (const char *, const char *)> &&cb);
 void EnumSceneCollections(function<bool (const char *, const char *)> &&cb);
 
+extern volatile bool streaming_active;
+extern volatile bool recording_active;
+extern volatile bool replaybuf_active;
+
 /* ------------------------------------------------------------------------- */
 
 template<typename T> struct OBSStudioCallback {
@@ -232,12 +236,7 @@
 
 	bool obs_frontend_streaming_active(void) override
 	{
-		bool active;
-		QMetaObject::invokeMethod(main,
-				"StreamingActive",
-				WaitConnection(),
-				Q_RETURN_ARG(bool, active));
-		return active;
+		return os_atomic_load_bool(&streaming_active);
 	}
 
 	void obs_frontend_recording_start(void) override
@@ -252,12 +251,7 @@
 
 	bool obs_frontend_recording_active(void) override
 	{
-		bool active;
-		QMetaObject::invokeMethod(main,
-				"RecordingActive",
-				WaitConnection(),
-				Q_RETURN_ARG(bool, active));
-		return active;
+		return os_atomic_load_bool(&recording_active);
 	}
 
 	void obs_frontend_replay_buffer_start(void) override
@@ -277,12 +271,7 @@
 
 	bool obs_frontend_replay_buffer_active(void) override
 	{
-		bool active;
-		QMetaObject::invokeMethod(main,
-				"ReplayBufferActive",
-				WaitConnection(),
-				Q_RETURN_ARG(bool, active));
-		return active;
+		return os_atomic_load_bool(&replaybuf_active);
 	}
 
 	void *obs_frontend_add_tools_menu_qaction(const char *name) override

obs-studio-23.0.0.tar.xz/UI/auth-mixer.cpp -> obs-studio-23.0.1.tar.xz/UI/auth-mixer.cpp Changed

@@ -44,7 +44,7 @@
 {
 }
 
-bool MixerAuth::GetChannelInfo()
+bool MixerAuth::GetChannelInfo(bool allow_retry)
 try {
 	std::string client_id = MIXER_CLIENTID;
 	deobfuscate_str(&client_id[0], MIXER_HASH);
@@ -148,8 +148,8 @@
 	 * it'll be an empty stream key usually.  So treat empty stream key as
 	 * an error. */
 	if (key_suffix.empty()) {
-		if (RetryLogin()) {
-			return GetChannelInfo();
+		if (allow_retry && RetryLogin()) {
+			return GetChannelInfo(false);
 		}
 		throw ErrorInfo("Auth Failure", "Could not get channel data");
 	}
@@ -213,6 +213,8 @@
 
 void MixerAuth::LoadUI()
 {
+	if (!cef)
+		return;
 	if (uiLoaded)
 		return;
 	if (!GetChannelInfo())
@@ -261,6 +263,9 @@
 
 bool MixerAuth::RetryLogin()
 {
+	if (!cef)
+		return false;
+
 	OAuthLogin login(OBSBasic::Get(), MIXER_AUTH_URL, false);
 	cef->add_popup_whitelist_url("about:blank", &login);
 
@@ -278,6 +283,10 @@
 
 std::shared_ptr<Auth> MixerAuth::Login(QWidget *parent)
 {
+	if (!cef) {
+		return nullptr;
+	}
+
 	OAuthLogin login(parent, MIXER_AUTH_URL, false);
 	cef->add_popup_whitelist_url("about:blank", &login);
 
@@ -296,7 +305,7 @@
 	}
 
 	std::string error;
-	if (auth->GetChannelInfo()) {
+	if (auth->GetChannelInfo(false)) {
 		return auth;
 	}

obs-studio-23.0.0.tar.xz/UI/auth-mixer.hpp -> obs-studio-23.0.1.tar.xz/UI/auth-mixer.hpp Changed

obs-studio-23.0.0.tar.xz/UI/auth-oauth.cpp -> obs-studio-23.0.1.tar.xz/UI/auth-oauth.cpp Changed

obs-studio-23.0.0.tar.xz/UI/auth-oauth.hpp -> obs-studio-23.0.1.tar.xz/UI/auth-oauth.hpp Changed

obs-studio-23.0.0.tar.xz/UI/auth-twitch.cpp -> obs-studio-23.0.1.tar.xz/UI/auth-twitch.cpp Changed

obs-studio-23.0.0.tar.xz/UI/window-basic-main-outputs.cpp -> obs-studio-23.0.1.tar.xz/UI/window-basic-main-outputs.cpp Changed

@@ -10,6 +10,10 @@
 
 extern bool EncoderAvailable(const char *encoder);
 
+volatile bool streaming_active = false;
+volatile bool recording_active = false;
+volatile bool replaybuf_active = false;
+
 static void OBSStreamStarting(void *data, calldata_t *params)
 {
 	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
@@ -41,6 +45,7 @@
 {
 	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
 	output->streamingActive = true;
+	os_atomic_set_bool(&streaming_active, true);
 	QMetaObject::invokeMethod(output->main, "StreamingStart");
 
 	UNUSED_PARAMETER(params);
@@ -56,6 +61,7 @@
 
 	output->streamingActive = false;
 	output->delayActive = false;
+	os_atomic_set_bool(&streaming_active, false);
 	QMetaObject::invokeMethod(output->main,
 			"StreamingStop", Q_ARG(int, code), Q_ARG(QString, arg_last_error));
 }
@@ -65,6 +71,7 @@
 	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
 
 	output->recordingActive = true;
+	os_atomic_set_bool(&recording_active, true);
 	QMetaObject::invokeMethod(output->main, "RecordingStart");
 
 	UNUSED_PARAMETER(params);
@@ -76,6 +83,7 @@
 	int code = (int)calldata_int(params, "code");
 
 	output->recordingActive = false;
+	os_atomic_set_bool(&recording_active, false);
 	QMetaObject::invokeMethod(output->main,
 			"RecordingStop", Q_ARG(int, code));
 
@@ -95,6 +103,7 @@
 	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
 
 	output->replayBufferActive = true;
+	os_atomic_set_bool(&replaybuf_active, true);
 	QMetaObject::invokeMethod(output->main, "ReplayBufferStart");
 
 	UNUSED_PARAMETER(params);
@@ -106,6 +115,7 @@
 	int code = (int)calldata_int(params, "code");
 
 	output->replayBufferActive = false;
+	os_atomic_set_bool(&replaybuf_active, false);
 	QMetaObject::invokeMethod(output->main,
 			"ReplayBufferStop", Q_ARG(int, code));
 
@@ -1226,9 +1236,14 @@
 			"Rescale");
 	const char *rescaleRes = config_get_string(main->Config(), "AdvOut",
 			"RescaleRes");
+	uint32_t caps = obs_encoder_get_caps(h264Streaming);
 	unsigned int cx = 0;
 	unsigned int cy = 0;
 
+	if ((caps & OBS_ENCODER_CAP_PASS_TEXTURE) != 0) {
+		rescale = false;
+	}
+
 	if (rescale && rescaleRes && *rescaleRes) {
 		if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
 			cx = 0;
@@ -1262,6 +1277,11 @@
 			obs_output_set_video_encoder(replayBuffer,
 					h264Streaming);
 	} else {
+		uint32_t caps = obs_encoder_get_caps(h264Recording);
+		if ((caps & OBS_ENCODER_CAP_PASS_TEXTURE) != 0) {
+			rescale = false;
+		}
+
 		if (rescale && rescaleRes && *rescaleRes) {
 			if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
 				cx = 0;

obs-studio-23.0.0.tar.xz/UI/window-basic-main.cpp -> obs-studio-23.0.1.tar.xz/UI/window-basic-main.cpp Changed

obs-studio-23.0.0.tar.xz/UI/window-remux.cpp -> obs-studio-23.0.1.tar.xz/UI/window-remux.cpp Changed

obs-studio-23.0.0.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-23.0.1.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

@@ -18,6 +18,8 @@
 #include <cinttypes>
 #include <util/base.h>
 #include <util/platform.h>
+#include <util/dstr.h>
+#include <util/util.hpp>
 #include <graphics/matrix3.h>
 #include "d3d11-subsystem.hpp"
 
@@ -227,6 +229,21 @@
 	D3D_FEATURE_LEVEL_9_3,
 };
 
+static const char *blacklisted_nv12_geforce_gpus[] = {
+	"8100",
+	"8200",
+	"8300",
+	"8400",
+	"8500",
+	"8600",
+	"8800",
+	"9300",
+	"9400",
+	"9500",
+	"9600",
+	"9800"
+};
+
 void gs_device::InitDevice(uint32_t adapterIdx)
 {
 	wstring adapterName;
@@ -244,11 +261,10 @@
 	adapterName = (adapter->GetDesc(&desc) == S_OK) ? desc.Description :
 		L"<unknown>";
 
-	char *adapterNameUTF8;
+	BPtr<char> adapterNameUTF8;
 	os_wcs_to_utf8_ptr(adapterName.c_str(), 0, &adapterNameUTF8);
 	blog(LOG_INFO, "Loading up D3D11 on adapter %s (%" PRIu32 ")",
-			adapterNameUTF8, adapterIdx);
-	bfree(adapterNameUTF8);
+			adapterNameUTF8.Get(), adapterIdx);
 
 	hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN,
 			NULL, createFlags, featureLevels,
@@ -258,19 +274,69 @@
 	if (FAILED(hr))
 		throw UnsupportedHWError("Failed to create device", hr);
 
-	ComQIPtr<ID3D11Device1> d3d11_1(device);
-	if (!!d3d11_1) {
-		D3D11_FEATURE_DATA_D3D11_OPTIONS opts = {};
-		hr = d3d11_1->CheckFeatureSupport(
-				D3D11_FEATURE_D3D11_OPTIONS,
-				&opts, sizeof(opts));
-		if (SUCCEEDED(hr)) {
-			nv12Supported = !!opts.ExtendedResourceSharing;
+	blog(LOG_INFO, "D3D11 loaded successfully, feature level used: %u",
+			(unsigned int)levelUsed);
+
+	/* ---------------------------------------- */
+	/* check for nv12 texture output support    */
+
+	nv12Supported = false;
+	bool geforce = astrstri(adapterNameUTF8, "geforce") != nullptr;
+	bool nvidia  = astrstri(adapterNameUTF8, "nvidia")  != nullptr;
+
+	/* don't use on blacklisted adapters */
+	if (geforce) {
+		for (const char *old_gpu : blacklisted_nv12_geforce_gpus) {
+			if (astrstri(adapterNameUTF8, old_gpu) != nullptr) {
+				return;
+			}
 		}
 	}
 
-	blog(LOG_INFO, "D3D11 loaded successfully, feature level used: %u",
-			(unsigned int)levelUsed);
+	/* Disable NV12 textures if NVENC not available, just as a safety
+	 * measure */
+	if (nvidia) {
+		HMODULE nvenc = LoadLibraryW((sizeof(void*) == 8)
+				? L"nvEncodeAPI64.dll"
+				: L"nvEncodeAPI.dll");
+		if (!nvenc) {
+			return;
+		}
+	}
+
+	ComQIPtr<ID3D11Device1> d3d11_1(device);
+	if (!d3d11_1) {
+		return;
+	}
+
+	/* needs to support extended resource sharing */
+	D3D11_FEATURE_DATA_D3D11_OPTIONS opts = {};
+	hr = d3d11_1->CheckFeatureSupport(
+			D3D11_FEATURE_D3D11_OPTIONS,
+			&opts, sizeof(opts));
+	if (FAILED(hr) || !opts.ExtendedResourceSharing) {
+		return;
+	}
+
+	/* needs to support the actual format */
+	UINT support = 0;
+	hr = device->CheckFormatSupport(
+			DXGI_FORMAT_NV12,
+			&support);
+	if (FAILED(hr)) {
+		return;
+	}
+
+	if ((support & D3D11_FORMAT_SUPPORT_TEXTURE2D) == 0) {
+		return;
+	}
+
+	/* must be usable as a render target */
+	if ((support & D3D11_FORMAT_SUPPORT_RENDER_TARGET) == 0) {
+		return;
+	}
+
+	nv12Supported = true;
 }
 
 static inline void ConvertStencilSide(D3D11_DEPTH_STENCILOP_DESC &desc,

obs-studio-23.0.0.tar.xz/libobs/obs-config.h -> obs-studio-23.0.1.tar.xz/libobs/obs-config.h Changed

obs-studio-23.0.0.tar.xz/libobs/obs-encoder.c -> obs-studio-23.0.1.tar.xz/libobs/obs-encoder.c Changed

obs-studio-23.0.0.tar.xz/libobs/obs.h -> obs-studio-23.0.1.tar.xz/libobs/obs.h Changed

obs-studio-23.0.0.tar.xz/plugins/obs-browser/panel/browser-panel-internal.hpp -> obs-studio-23.0.1.tar.xz/plugins/obs-browser/panel/browser-panel-internal.hpp Changed

obs-studio-23.0.0.tar.xz/plugins/obs-browser/panel/browser-panel.cpp -> obs-studio-23.0.1.tar.xz/plugins/obs-browser/panel/browser-panel.cpp Changed

obs-studio-23.0.0.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c -> obs-studio-23.0.1.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c Changed

Build Results
RPM Lint

Refresh

Comments for request 4450 0

Request History

boombatower created request over 5 years ago

boombatower accepted request over 5 years ago