Request 5613 (accepted)

Overview

Request 5613 (accepted)

- Update to version 28.0.3:
* win-wasapi: Fix Stop hang
* frontend-tools: Display dialog when changing Python version
* frontend-tools: Display Python version in UI
* UI: Fix AutoRemux not working when FFmpeg output configured
* win-wasapi: Don't reconnect when inactive
* libobs: Update version to 28.0.3
* obs-scripting: Fix compile when python is not found
* obs-ffmpeg: Fix unpause causing certain encoders to fail
* libobs: Add function to get encoder pause offset
* UI: Don't reselect SceneTree items if tree is clearing
* UI: Remove executable bit from public key file
* obs-ffmpeg: Fix m3u8 recording in AMF
* linux-pipewire: Close sessions as we are done with them
* libobs/media-io: Restore color range conversion
* CI: Downgrade Sphinx to fix docs build error
* libobs/media-io: Avoid scaler for range diff
* linux-capture: Fixup window name/class checking
* obs-ffmpeg: Cap AMF encoder at 100 Mbps
* UI: Fix color of popout icon
* UI: Fix dock titlebar icons not loading

Created by frispete about 2 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio

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

obs-studio.changes Changed

@@ -1,4 +1,29 @@
 -------------------------------------------------------------------
+Sat Oct 22 09:19:53 UTC 2022 - hpj@urpla.net
+
+- Update to version 28.0.3:
+  * win-wasapi: Fix Stop hang
+  * frontend-tools: Display dialog when changing Python version
+  * frontend-tools: Display Python version in UI
+  * UI: Fix AutoRemux not working when FFmpeg output configured
+  * win-wasapi: Don't reconnect when inactive
+  * libobs: Update version to 28.0.3
+  * obs-scripting: Fix compile when python is not found
+  * obs-ffmpeg: Fix unpause causing certain encoders to fail
+  * libobs: Add function to get encoder pause offset
+  * UI: Don't reselect SceneTree items if tree is clearing
+  * UI: Remove executable bit from public key file
+  * obs-ffmpeg: Fix m3u8 recording in AMF
+  * linux-pipewire: Close sessions as we are done with them
+  * libobs/media-io: Restore color range conversion
+  * CI: Downgrade Sphinx to fix docs build error
+  * libobs/media-io: Avoid scaler for range diff
+  * linux-capture: Fixup window name/class checking
+  * obs-ffmpeg: Cap AMF encoder at 100 Mbps
+  * UI: Fix color of popout icon
+  * UI: Fix dock titlebar icons not loading
+
+-------------------------------------------------------------------
 Sat Sep 24 16:13:45 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
 
 - Disable cef for other than x86_64 archs

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-28.0.2.tar.xz/.github/workflows/docs.yml -> obs-studio-28.0.3.tar.xz/.github/workflows/docs.yml Changed

obs-studio-28.0.2.tar.xz/UI/data/themes/Acri.qss -> obs-studio-28.0.3.tar.xz/UI/data/themes/Acri.qss Changed

obs-studio-28.0.2.tar.xz/UI/data/themes/Grey.qss -> obs-studio-28.0.3.tar.xz/UI/data/themes/Grey.qss Changed

obs-studio-28.0.2.tar.xz/UI/data/themes/Light.qss -> obs-studio-28.0.3.tar.xz/UI/data/themes/Light.qss Changed

obs-studio-28.0.2.tar.xz/UI/data/themes/Light/popout.svg -> obs-studio-28.0.3.tar.xz/UI/data/themes/Light/popout.svg Changed

obs-studio-28.0.2.tar.xz/UI/data/themes/Rachni.qss -> obs-studio-28.0.3.tar.xz/UI/data/themes/Rachni.qss Changed

obs-studio-28.0.2.tar.xz/UI/data/themes/Yami.qss -> obs-studio-28.0.3.tar.xz/UI/data/themes/Yami.qss Changed

obs-studio-28.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-US.ini -> obs-studio-28.0.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-US.ini Changed

obs-studio-28.0.2.tar.xz/UI/frontend-plugins/frontend-tools/forms/scripts.ui -> obs-studio-28.0.3.tar.xz/UI/frontend-plugins/frontend-tools/forms/scripts.ui Changed

obs-studio-28.0.2.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp -> obs-studio-28.0.3.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp Changed

@@ -194,6 +194,7 @@
 		config_get_string(config, "Python", "Path" ARCH_NAME);
 	ui->pythonPath->setText(path);
 	ui->pythonPathLabel->setText(obs_module_text(PYTHONPATH_LABEL_TEXT));
+	updatePythonVersionLabel();
 #else
 	delete ui->pythonSettingsTab;
 	ui->pythonSettingsTab = nullptr;
@@ -219,6 +220,20 @@
 		       ui->scripts->currentRow());
 }
 
+void ScriptsTool::updatePythonVersionLabel()
+{
+	QString label;
+	if (obs_scripting_python_loaded()) {
+		char version8;
+		obs_scripting_python_version(version, sizeof(version));
+		label = QString(obs_module_text("PythonSettings.PythonVersion"))
+				.arg(version);
+	} else {
+		label = obs_module_text("PythonSettings.PythonNotLoaded");
+	}
+	ui->pythonVersionLabel->setText(label);
+}
+
 void ScriptsTool::RemoveScript(const char *path)
 {
 	for (size_t i = 0; i < scriptData->scripts.size(); i++) {
@@ -455,11 +470,29 @@
 
 	ui->pythonPath->setText(newPath);
 
-	if (obs_scripting_python_loaded())
+	bool loaded = obs_scripting_python_loaded();
+
+	if (loaded && !newPath.isEmpty() && curPath.compare(newPath) != 0) {
+		char version8;
+		obs_scripting_python_version(version, sizeof(version));
+		QString message =
+			QString(obs_module_text(
+					"PythonSettings.AlreadyLoaded.Message"))
+				.arg(version);
+		OBSMessageBox::information(
+			this,
+			obs_module_text("PythonSettings.AlreadyLoaded.Title"),
+			message);
 		return;
+	} else if (loaded) {
+		return;
+	}
+
 	if (!obs_scripting_load_python(path))
 		return;
 
+	updatePythonVersionLabel();
+
 	for (OBSScript &script : scriptData->scripts) {
 		enum obs_script_lang lang = obs_script_get_lang(script);
 		if (lang == OBS_SCRIPT_LANG_PYTHON) {

obs-studio-28.0.2.tar.xz/UI/frontend-plugins/frontend-tools/scripts.hpp -> obs-studio-28.0.3.tar.xz/UI/frontend-plugins/frontend-tools/scripts.hpp Changed

obs-studio-28.0.2.tar.xz/UI/item-widget-helpers.cpp -> obs-studio-28.0.3.tar.xz/UI/item-widget-helpers.cpp Changed

obs-studio-28.0.2.tar.xz/UI/scene-tree.cpp -> obs-studio-28.0.3.tar.xz/UI/scene-tree.cpp Changed

obs-studio-28.0.2.tar.xz/UI/window-basic-main.cpp -> obs-studio-28.0.3.tar.xz/UI/window-basic-main.cpp Changed

obs-studio-28.0.2.tar.xz/deps/obs-scripting/obs-scripting-python.c -> obs-studio-28.0.3.tar.xz/deps/obs-scripting/obs-scripting-python.c Changed

obs-studio-28.0.2.tar.xz/deps/obs-scripting/obs-scripting.c -> obs-studio-28.0.3.tar.xz/deps/obs-scripting/obs-scripting.c Changed

obs-studio-28.0.2.tar.xz/deps/obs-scripting/obs-scripting.h -> obs-studio-28.0.3.tar.xz/deps/obs-scripting/obs-scripting.h Changed

obs-studio-28.0.2.tar.xz/libobs/media-io/video-scaler-ffmpeg.c -> obs-studio-28.0.3.tar.xz/libobs/media-io/video-scaler-ffmpeg.c Changed

@@ -19,6 +19,7 @@
 #include "video-scaler.h"
 
 #include <libavutil/imgutils.h>
+#include <libavutil/opt.h>
 #include <libswscale/swscale.h>
 
 struct video_scaler {
@@ -188,16 +189,27 @@
 		goto fail;
 	}
 
-	scaler->swscale = sws_getCachedContext(NULL, src->width, src->height,
-					       format_src, dst->width,
-					       dst->height, format_dst,
-					       scale_type, NULL, NULL, NULL);
+	scaler->swscale = sws_alloc_context();
 	if (!scaler->swscale) {
 		blog(LOG_ERROR, "video_scaler_create: Could not create "
 				"swscale");
 		goto fail;
 	}
 
+	av_opt_set_int(scaler->swscale, "sws_flags", scale_type, 0);
+	av_opt_set_int(scaler->swscale, "srcw", src->width, 0);
+	av_opt_set_int(scaler->swscale, "srch", src->height, 0);
+	av_opt_set_int(scaler->swscale, "dstw", dst->width, 0);
+	av_opt_set_int(scaler->swscale, "dsth", dst->height, 0);
+	av_opt_set_int(scaler->swscale, "src_format", format_src, 0);
+	av_opt_set_int(scaler->swscale, "dst_format", format_dst, 0);
+	av_opt_set_int(scaler->swscale, "src_range", range_src, 0);
+	av_opt_set_int(scaler->swscale, "dst_range", range_dst, 0);
+	if (sws_init_context(scaler->swscale, NULL, NULL) < 0) {
+		blog(LOG_ERROR, "video_scaler_create: sws_init_context failed");
+		goto fail;
+	}
+
 	ret = sws_setColorspaceDetails(scaler->swscale, coeff_src, range_src,
 				       coeff_dst, range_dst, 0, FIXED_1_0,
 				       FIXED_1_0);

obs-studio-28.0.2.tar.xz/libobs/obs-config.h -> obs-studio-28.0.3.tar.xz/libobs/obs-config.h Changed

obs-studio-28.0.2.tar.xz/libobs/obs-encoder.c -> obs-studio-28.0.3.tar.xz/libobs/obs-encoder.c Changed

obs-studio-28.0.2.tar.xz/libobs/obs.h -> obs-studio-28.0.3.tar.xz/libobs/obs.h Changed

obs-studio-28.0.2.tar.xz/plugins/linux-capture/xcomposite-input.c -> obs-studio-28.0.3.tar.xz/plugins/linux-capture/xcomposite-input.c Changed

obs-studio-28.0.2.tar.xz/plugins/linux-pipewire/screencast-portal.c -> obs-studio-28.0.3.tar.xz/plugins/linux-pipewire/screencast-portal.c Changed

obs-studio-28.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.c -> obs-studio-28.0.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.c Changed

@@ -375,18 +375,33 @@
 	stream->found_audiopacket->track_idx = true;
 }
 
-static bool ffmpeg_mux_start(void *data)
+static inline void update_encoder_settings(struct ffmpeg_muxer *stream,
+					   const char *path)
 {
-	struct ffmpeg_muxer *stream = data;
-	obs_data_t *settings;
-	const char *path;
+	obs_encoder_t *vencoder = obs_output_get_video_encoder(stream->output);
+	const char *ext = strrchr(path, '.');
+
+	/* if using m3u8, repeat headers */
+	if (ext && strcmp(ext, ".m3u8") == 0) {
+		obs_data_t *settings = obs_encoder_get_settings(vencoder);
+		obs_data_set_bool(settings, "repeat_headers", true);
+		obs_encoder_update(vencoder, settings);
+		obs_data_release(settings);
+	}
+}
+
+static inline bool ffmpeg_mux_start_internal(struct ffmpeg_muxer *stream,
+					     obs_data_t *settings)
+{
+	const char *path = obs_data_get_string(settings, "path");
+
+	update_encoder_settings(stream, path);
 
 	if (!obs_output_can_begin_data_capture(stream->output, 0))
 		return false;
 	if (!obs_output_initialize_encoders(stream->output, 0))
 		return false;
 
-	settings = obs_output_get_settings(stream->output);
 	if (stream->is_network) {
 		obs_service_t *service;
 		service = obs_output_get_service(stream->output);
@@ -395,7 +410,6 @@
 		path = obs_service_get_url(service);
 		stream->split_file = false;
 	} else {
-		path = obs_data_get_string(settings, "path");
 
 		stream->max_time =
 			obs_data_get_int(settings, "max_time_sec") * 1000000LL;
@@ -427,7 +441,6 @@
 	}
 
 	start_pipe(stream, path);
-	obs_data_release(settings);
 
 	if (!stream->pipe) {
 		obs_output_set_last_error(
@@ -446,6 +459,17 @@
 	return true;
 }
 
+static bool ffmpeg_mux_start(void *data)
+{
+	struct ffmpeg_muxer *stream = data;
+
+	obs_data_t *settings = obs_output_get_settings(stream->output);
+	bool success = ffmpeg_mux_start_internal(stream, settings);
+	obs_data_release(settings);
+
+	return success;
+}
+
 int deactivate(struct ffmpeg_muxer *stream, int code)
 {
 	int ret = -1;

obs-studio-28.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c -> obs-studio-28.0.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c Changed

obs-studio-28.0.2.tar.xz/plugins/obs-ffmpeg/texture-amf.cpp -> obs-studio-28.0.3.tar.xz/plugins/obs-ffmpeg/texture-amf.cpp Changed

obs-studio-28.0.2.tar.xz/plugins/win-wasapi/win-wasapi.cpp -> obs-studio-28.0.3.tar.xz/plugins/win-wasapi/win-wasapi.cpp Changed

@@ -182,7 +182,7 @@
 	std::atomic<bool> isDefaultDevice = false;
 
 	bool previouslyFailed = false;
-	WinHandle reconnectThread;
+	WinHandle reconnectThread = NULL;
 
 	class CallbackStartCapture : public ARtwqAsyncCallback {
 	public:
@@ -238,6 +238,7 @@
 	WinHandle stopSignal;
 	WinHandle receiveSignal;
 	WinHandle restartSignal;
+	WinHandle reconnectExitSignal;
 	WinHandle exitSignal;
 	WinHandle initSignal;
 	DWORD reconnectDuration = 0;
@@ -298,6 +299,9 @@
 	void Update(obs_data_t *settings);
 	void OnWindowChanged(obs_data_t *settings);
 
+	void Activate();
+	void Deactivate();
+
 	void SetDefaultDevice(EDataFlow flow, ERole role, LPCWSTR id);
 
 	void OnStartCapture();
@@ -390,6 +394,10 @@
 	if (!restartSignal.Valid())
 		throw "Could not create restart signal";
 
+	reconnectExitSignal = CreateEvent(nullptr, true, false, nullptr);
+	if (!reconnectExitSignal.Valid())
+		throw "Could not create reconnect exit signal";
+
 	exitSignal = CreateEvent(nullptr, true, false, nullptr);
 	if (!exitSignal.Valid())
 		throw "Could not create exit signal";
@@ -402,11 +410,6 @@
 	if (!reconnectSignal.Valid())
 		throw "Could not create reconnect signal";
 
-	reconnectThread = CreateThread(
-		nullptr, 0, WASAPISource::ReconnectThread, this, 0, nullptr);
-	if (!reconnectThread.Valid())
-		throw "Failed to create reconnect thread";
-
 	notify = new WASAPINotify(this);
 	if (!notify)
 		throw "Could not create WASAPINotify";
@@ -532,11 +535,19 @@
 	if (rtwq_supported)
 		SetEvent(receiveSignal);
 
-	WaitForSingleObject(idleSignal, INFINITE);
+	if (reconnectThread.Valid()) {
+		WaitForSingleObject(idleSignal, INFINITE);
+	} else {
+		const HANDLE sigs = {reconnectSignal, idleSignal};
+		WaitForMultipleObjects(_countof(sigs), sigs, false, INFINITE);
+	}
 
 	SetEvent(exitSignal);
 
-	WaitForSingleObject(reconnectThread, INFINITE);
+	if (reconnectThread.Valid()) {
+		SetEvent(reconnectExitSignal);
+		WaitForSingleObject(reconnectThread, INFINITE);
+	}
 
 	if (rtwq_supported)
 		rtwq_unlock_work_queue(sampleReady.GetQueueId());
@@ -657,6 +668,25 @@
 		SetEvent(restartSignal);
 }
 
+void WASAPISource::Activate()
+{
+	if (!reconnectThread.Valid()) {
+		ResetEvent(reconnectExitSignal);
+		reconnectThread = CreateThread(nullptr, 0,
+					       WASAPISource::ReconnectThread,
+					       this, 0, nullptr);
+	}
+}
+
+void WASAPISource::Deactivate()
+{
+	if (reconnectThread.Valid()) {
+		SetEvent(reconnectExitSignal);
+		WaitForSingleObject(reconnectThread, INFINITE);
+		reconnectThread = NULL;
+	}
+}
+
 ComPtr<IMMDevice> WASAPISource::InitDevice(IMMDeviceEnumerator *enumerator,
 					   bool isDefaultDevice,
 					   SourceType type,
@@ -1005,10 +1035,15 @@
 	WASAPISource *source = (WASAPISource *)param;
 
 	const HANDLE sigs = {
-		source->exitSignal,
+		source->reconnectExitSignal,
 		source->reconnectSignal,
 	};
 
+	const HANDLE reconnect_sigs = {
+		source->reconnectExitSignal,
+		source->stopSignal,
+	};
+
 	bool exit = false;
 	while (!exit) {
 		const DWORD ret = WaitForMultipleObjects(_countof(sigs), sigs,
@@ -1020,8 +1055,10 @@
 		default:
 			assert(ret == (WAIT_OBJECT_0 + 1));
 			if (source->reconnectDuration > 0) {
-				WaitForSingleObject(source->stopSignal,
-						    source->reconnectDuration);
+				WaitForMultipleObjects(
+					_countof(reconnect_sigs),
+					reconnect_sigs, false,
+					source->reconnectDuration);
 			}
 			source->Start();
 		}
@@ -1426,6 +1463,16 @@
 	static_cast<WASAPISource *>(obj)->Update(settings);
 }
 
+static void ActivateWASAPISource(void *obj)
+{
+	static_cast<WASAPISource *>(obj)->Activate();
+}
+
+static void DeactivateWASAPISource(void *obj)
+{
+	static_cast<WASAPISource *>(obj)->Deactivate();
+}
+
 static bool UpdateWASAPIMethod(obs_properties_t *props, obs_property_t *,
 			       obs_data_t *settings)
 {
@@ -1542,6 +1589,8 @@
 	info.create = CreateWASAPIInput;
 	info.destroy = DestroyWASAPISource;
 	info.update = UpdateWASAPISource;
+	info.activate = ActivateWASAPISource;
+	info.deactivate = DeactivateWASAPISource;
 	info.get_defaults = GetWASAPIDefaultsInput;
 	info.get_properties = GetWASAPIPropertiesInput;
 	info.icon_type = OBS_ICON_TYPE_AUDIO_INPUT;
@@ -1559,6 +1608,8 @@
 	info.create = CreateWASAPIDeviceOutput;
 	info.destroy = DestroyWASAPISource;
 	info.update = UpdateWASAPISource;
+	info.activate = ActivateWASAPISource;
+	info.deactivate = DeactivateWASAPISource;
 	info.get_defaults = GetWASAPIDefaultsDeviceOutput;
 	info.get_properties = GetWASAPIPropertiesDeviceOutput;
 	info.icon_type = OBS_ICON_TYPE_AUDIO_OUTPUT;
@@ -1576,6 +1627,8 @@
 	info.create = CreateWASAPIProcessOutput;
 	info.destroy = DestroyWASAPISource;
 	info.update = UpdateWASAPISource;
+	info.activate = ActivateWASAPISource;
+	info.deactivate = DeactivateWASAPISource;
 	info.get_defaults = GetWASAPIDefaultsProcessOutput;
 	info.get_properties = GetWASAPIPropertiesProcessOutput;
 	info.icon_type = OBS_ICON_TYPE_PROCESS_AUDIO_OUTPUT;

Build Results
RPM Lint

Refresh

Comments for request 5613 0

Request History

frispete created request about 2 years ago

boombatower accepted request about 2 years ago

thanks