Packman Build Service PMBS

obs-studio.changes Changed

@@ -1,4 +1,38 @@
 -------------------------------------------------------------------
+Wed Jun 21 08:03:37 UTC 2023 - hpj@urpla.net
+
+- Update to version 29.1.3:
+  * UI: Translate place holder name for new group
+  * UI: Fix changed state of audio settings
+  * UI: Fix changing quick transition to/from fade to black
+  * UI: Fix checked state of source toolbar menu item
+  * text-freetype2: Fix not updating chat log mode property
+  * libobs: Update version to 29.1.3
+  * obs-ffmpeg: Fix logic in one of the AMF preset fallback checks
+  * obs-websocket: Update version to 5.2.3
+  * libobs: Set video thread qos class to user interactive on macOS
+  * mac-capture: Explicitly set clear background for SCK
+  * UI: Don't update text source when nothing changed
+  * docs: Clarify da_erase_range
+  * deps/obs-scripting: Fix crash removing callbacks in script_unload
+  * libobs: Use da_clear() to clear obs_core_data::sources_to_tick
+  * libobs/util: Add da_clear()
+  * libobs: Don't keep the sources mutex in tick_sources
+  * libobs/util: Actually fix use-after-free in da_insert_new
+  * libobs/util: Fix use-after-free in darray_insert_new
+  * win-capture: Skip compat helper matching if properties are null
+  * win-capture: Add Honkai: Star Rail to compatibility list
+  * UI: Don't trigger a settings update when list is empty To avoid recursive call
+  * obs-ffmpeg: Consider requested throughput in AMF preset fallback
+  * obs-ffmpeg: Fix AMF encoder reconfiguration
+  * UI: Fix filter shortcuts not showing in context menu
+  * text-freetype2: Fix crash after reaching buffer size
+  * UI: Fix menu actions missing shortcuts
+  * libobs: Fix crash when properties are deleted in callback
+  * UI: Assume RTMP if service has no protcol
+  * Revert "UI: Reset service selection to custom if name not found"
+
+-------------------------------------------------------------------
 Fri Jun  2 15:59:13 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>
 
 - libmfx is available for x86 archs only

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-29.1.2.tar.xz/UI/context-bar-controls.cpp -> obs-studio-29.1.3.tar.xz/UI/context-bar-controls.cpp Changed

obs-studio-29.1.2.tar.xz/UI/forms/OBSBasic.ui -> obs-studio-29.1.3.tar.xz/UI/forms/OBSBasic.ui Changed

obs-studio-29.1.2.tar.xz/UI/forms/OBSBasicFilters.ui -> obs-studio-29.1.3.tar.xz/UI/forms/OBSBasicFilters.ui Changed

obs-studio-29.1.2.tar.xz/UI/properties-view.cpp -> obs-studio-29.1.3.tar.xz/UI/properties-view.cpp Changed

obs-studio-29.1.2.tar.xz/UI/window-basic-filters.cpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-filters.cpp Changed

@@ -81,6 +81,7 @@
 		QApplication::translate("OBSBasicFilters", "Del", nullptr));
 #endif // QT_NO_SHORTCUT
 
+	addAction(ui->actionRenameFilter);
 	addAction(ui->actionRemoveFilter);
 	addAction(ui->actionMoveUp);
 	addAction(ui->actionMoveDown);
@@ -154,24 +155,10 @@
 		ui->preview->hide();
 	}
 
-	QAction *renameAsync = new QAction(ui->asyncWidget);
-	renameAsync->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(renameAsync, SIGNAL(triggered()), this,
-		SLOT(RenameAsyncFilter()));
-	ui->asyncWidget->addAction(renameAsync);
-
-	QAction *renameEffect = new QAction(ui->effectWidget);
-	renameEffect->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(renameEffect, SIGNAL(triggered()), this,
-		SLOT(RenameEffectFilter()));
-	ui->effectWidget->addAction(renameEffect);
-
 #ifdef __APPLE__
-	renameAsync->setShortcut({Qt::Key_Return});
-	renameEffect->setShortcut({Qt::Key_Return});
+	ui->actionRenameFilter->setShortcut({Qt::Key_Return});
 #else
-	renameAsync->setShortcut({Qt::Key_F2});
-	renameEffect->setShortcut({Qt::Key_F2});
+	ui->actionRenameFilter->setShortcut({Qt::Key_F2});
 #endif
 
 	UpdateFilters();
@@ -932,6 +919,14 @@
 		on_moveEffectFilterDown_clicked();
 }
 
+void OBSBasicFilters::on_actionRenameFilter_triggered()
+{
+	if (ui->asyncFilters->hasFocus())
+		RenameAsyncFilter();
+	else if (ui->effectFilters->hasFocus())
+		RenameEffectFilter();
+}
+
 void OBSBasicFilters::CustomContextMenu(const QPoint &pos, bool async)
 {
 	QListWidget *list = async ? ui->asyncFilters : ui->effectFilters;
@@ -948,17 +943,11 @@
 			async ? SLOT(DuplicateAsyncFilter())
 			      : SLOT(DuplicateEffectFilter());
 
-		const char *renameSlot = async ? SLOT(RenameAsyncFilter())
-					       : SLOT(RenameEffectFilter());
-		const char *removeSlot =
-			async ? SLOT(on_removeAsyncFilter_clicked())
-			      : SLOT(on_removeEffectFilter_clicked());
-
 		popup.addSeparator();
 		popup.addAction(QTStr("Duplicate"), this, dulpicateSlot);
 		popup.addSeparator();
-		popup.addAction(QTStr("Rename"), this, renameSlot);
-		popup.addAction(QTStr("Remove"), this, removeSlot);
+		popup.addAction(ui->actionRenameFilter);
+		popup.addAction(ui->actionRemoveFilter);
 		popup.addSeparator();
 
 		QAction *copyAction = new QAction(QTStr("Copy"));

obs-studio-29.1.2.tar.xz/UI/window-basic-filters.hpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-filters.hpp Changed

obs-studio-29.1.2.tar.xz/UI/window-basic-main-transitions.cpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-main-transitions.cpp Changed

obs-studio-29.1.2.tar.xz/UI/window-basic-main.cpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-main.cpp Changed

@@ -392,12 +392,12 @@
 	connect(diskFullTimer, SIGNAL(timeout()), this,
 		SLOT(CheckDiskSpaceRemaining()));
 
-	renameScene = new QAction(ui->scenesDock);
+	renameScene = new QAction(QTStr("Rename"), ui->scenesDock);
 	renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 	connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName()));
 	ui->scenesDock->addAction(renameScene);
 
-	renameSource = new QAction(ui->sourcesDock);
+	renameSource = new QAction(QTStr("Rename"), ui->sourcesDock);
 	renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 	connect(renameSource, SIGNAL(triggered()), this,
 		SLOT(EditSceneItemName()));
@@ -5385,9 +5385,8 @@
 		popup.addAction(copyFilters);
 		popup.addAction(pasteFilters);
 		popup.addSeparator();
-		popup.addAction(QTStr("Rename"), this, SLOT(EditSceneName()));
-		popup.addAction(QTStr("Remove"), this,
-				SLOT(RemoveSelectedScene()));
+		popup.addAction(renameScene);
+		popup.addAction(ui->actionRemoveScene);
 		popup.addSeparator();
 
 		order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), this,
@@ -5893,10 +5892,8 @@
 		colorSelect = new ColorSelect(colorMenu);
 		popup.addMenu(AddBackgroundColorMenu(
 			colorMenu, colorWidgetAction, colorSelect, sceneItem));
-		popup.addAction(QTStr("Rename"), this,
-				SLOT(EditSceneItemName()));
-		popup.addAction(QTStr("Remove"), this,
-				SLOT(on_actionRemoveSource_triggered()));
+		popup.addAction(renameSource);
+		popup.addAction(ui->actionRemoveSource);
 		popup.addSeparator();
 
 		popup.addMenu(ui->orderMenu);
@@ -9368,11 +9365,13 @@
 void OBSBasic::ShowContextBar()
 {
 	on_toggleContextBar_toggled(true);
+	ui->toggleContextBar->setChecked(true);
 }
 
 void OBSBasic::HideContextBar()
 {
 	on_toggleContextBar_toggled(false);
+	ui->toggleContextBar->setChecked(false);
 }
 
 void OBSBasic::on_toggleContextBar_toggled(bool visible)

obs-studio-29.1.2.tar.xz/UI/window-basic-settings-stream.cpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-settings-stream.cpp Changed

obs-studio-29.1.2.tar.xz/UI/window-basic-settings.cpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-settings.cpp Changed

obs-studio-29.1.2.tar.xz/UI/window-basic-source-select.cpp -> obs-studio-29.1.3.tar.xz/UI/window-basic-source-select.cpp Changed

obs-studio-29.1.2.tar.xz/deps/obs-scripting/obs-scripting-lua.c -> obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-lua.c Changed

obs-studio-29.1.2.tar.xz/docs/sphinx/reference-libobs-util-darray.rst -> obs-studio-29.1.3.tar.xz/docs/sphinx/reference-libobs-util-darray.rst Changed

obs-studio-29.1.2.tar.xz/libobs/obs-config.h -> obs-studio-29.1.3.tar.xz/libobs/obs-config.h Changed

obs-studio-29.1.2.tar.xz/libobs/obs-internal.h -> obs-studio-29.1.3.tar.xz/libobs/obs-internal.h Changed

obs-studio-29.1.2.tar.xz/libobs/obs-properties.c -> obs-studio-29.1.3.tar.xz/libobs/obs-properties.c Changed

obs-studio-29.1.2.tar.xz/libobs/obs-video.c -> obs-studio-29.1.3.tar.xz/libobs/obs-video.c Changed

@@ -45,35 +45,42 @@
 	/* ------------------------------------- */
 	/* call tick callbacks                   */
 
-	pthread_mutex_lock(&obs->data.draw_callbacks_mutex);
+	pthread_mutex_lock(&data->draw_callbacks_mutex);
 
-	for (size_t i = obs->data.tick_callbacks.num; i > 0; i--) {
+	for (size_t i = data->tick_callbacks.num; i > 0; i--) {
 		struct tick_callback *callback;
-		callback = obs->data.tick_callbacks.array + (i - 1);
+		callback = data->tick_callbacks.array + (i - 1);
 		callback->tick(callback->param, seconds);
 	}
 
-	pthread_mutex_unlock(&obs->data.draw_callbacks_mutex);
+	pthread_mutex_unlock(&data->draw_callbacks_mutex);
 
 	/* ------------------------------------- */
-	/* call the tick function of each source */
+	/* get an array of all sources to tick   */
+
+	da_clear(data->sources_to_tick);
 
 	pthread_mutex_lock(&data->sources_mutex);
 
 	source = data->sources;
 	while (source) {
 		obs_source_t *s = obs_source_get_ref(source);
-
-		if (s) {
-			obs_source_video_tick(s, seconds);
-			obs_source_release(s);
-		}
-
+		if (s)
+			da_push_back(data->sources_to_tick, &s);
 		source = (struct obs_source *)source->context.hh_uuid.next;
 	}
 
 	pthread_mutex_unlock(&data->sources_mutex);
 
+	/* ------------------------------------- */
+	/* call the tick function of each source */
+
+	for (size_t i = 0; i < data->sources_to_tick.num; i++) {
+		obs_source_t *s = data->sources_to_tick.arrayi;
+		obs_source_video_tick(s, seconds);
+		obs_source_release(s);
+	}
+
 	return cur_time;
 }

obs-studio-29.1.2.tar.xz/libobs/obs.c -> obs-studio-29.1.3.tar.xz/libobs/obs.c Changed

obs-studio-29.1.2.tar.xz/libobs/util/darray.h -> obs-studio-29.1.3.tar.xz/libobs/util/darray.h Changed

obs-studio-29.1.2.tar.xz/plugins/mac-capture/mac-screen-capture.m -> obs-studio-29.1.3.tar.xz/plugins/mac-capture/mac-screen-capture.m Changed

obs-studio-29.1.2.tar.xz/plugins/obs-ffmpeg/texture-amf.cpp -> obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/texture-amf.cpp Changed

@@ -104,6 +104,7 @@
 	AMF_SURFACE_FORMAT amf_format;
 
 	amf_int64 max_throughput = 0;
+	amf_int64 requested_throughput = 0;
 	amf_int64 throughput = 0;
 	int64_t dts_offset = 0;
 	uint32_t cx;
@@ -440,6 +441,8 @@
 	if (res == AMF_OK) {
 		caps->GetProperty(get_opt_name(CAP_MAX_THROUGHPUT),
 				  &enc->max_throughput);
+		caps->GetProperty(get_opt_name(CAP_REQUESTED_THROUGHPUT),
+				  &enc->requested_throughput);
 	}
 }
 
@@ -455,7 +458,8 @@
 			preset = "quality";
 			set_opt(QUALITY_PRESET, get_preset(enc, preset));
 		} else {
-			if (enc->max_throughput < enc->throughput) {
+			if (enc->max_throughput - enc->requested_throughput <
+			    enc->throughput) {
 				preset = "quality";
 				refresh_throughput_caps(enc, preset);
 			}
@@ -467,7 +471,8 @@
 			preset = "balanced";
 			set_opt(QUALITY_PRESET, get_preset(enc, preset));
 		} else {
-			if (enc->max_throughput < enc->throughput) {
+			if (enc->max_throughput - enc->requested_throughput <
+			    enc->throughput) {
 				preset = "balanced";
 				refresh_throughput_caps(enc, preset);
 			}
@@ -476,7 +481,8 @@
 
 	if (astrcmpi(preset, "balanced") == 0) {
 		if (enc->max_throughput &&
-		    enc->max_throughput < enc->throughput) {
+		    enc->max_throughput - enc->requested_throughput <
+			    enc->throughput) {
 			preset = "speed";
 			refresh_throughput_caps(enc, preset);
 		}
@@ -1254,13 +1260,17 @@
 	int64_t qp = obs_data_get_int(settings, "cqp");
 	const char *rc_str = obs_data_get_string(settings, "rate_control");
 	int rc = get_avc_rate_control(rc_str);
-	AMF_RESULT res;
+	AMF_RESULT res = AMF_OK;
 
 	amf_avc_update_data(enc, rc, bitrate * 1000, qp);
 
+	res = enc->amf_encoder->Flush();
+	if (res != AMF_OK)
+		throw amf_error("AMFComponent::Flush failed", res);
+
 	res = enc->amf_encoder->ReInit(enc->cx, enc->cy);
 	if (res != AMF_OK)
-		throw amf_error("AMFComponent::Init failed", res);
+		throw amf_error("AMFComponent::ReInit failed", res);
 
 	return true;
 
@@ -1364,6 +1374,8 @@
 				  &enc->bframes_supported);
 		caps->GetProperty(AMF_VIDEO_ENCODER_CAP_MAX_THROUGHPUT,
 				  &enc->max_throughput);
+		caps->GetProperty(AMF_VIDEO_ENCODER_CAP_REQUESTED_THROUGHPUT,
+				  &enc->requested_throughput);
 	}
 
 	const char *preset = obs_data_get_string(settings, "preset");
@@ -1488,8 +1500,7 @@
 	amf_encoder_info.get_name = amf_avc_get_name;
 	amf_encoder_info.create = amf_avc_create_texencode;
 	amf_encoder_info.destroy = amf_destroy;
-	/* FIXME: Figure out why encoder does not survive reconfiguration
-	amf_encoder_info.update = amf_avc_update; */
+	amf_encoder_info.update = amf_avc_update;
 	amf_encoder_info.encode_texture = amf_encode_tex;
 	amf_encoder_info.get_defaults = amf_defaults;
 	amf_encoder_info.get_properties = amf_avc_properties;
@@ -1581,13 +1592,17 @@
 	int64_t qp = obs_data_get_int(settings, "cqp");
 	const char *rc_str = obs_data_get_string(settings, "rate_control");
 	int rc = get_hevc_rate_control(rc_str);
-	AMF_RESULT res;
+	AMF_RESULT res = AMF_OK;
 
 	amf_hevc_update_data(enc, rc, bitrate * 1000, qp);
 
+	res = enc->amf_encoder->Flush();
+	if (res != AMF_OK)
+		throw amf_error("AMFComponent::Flush failed", res);
+
 	res = enc->amf_encoder->ReInit(enc->cx, enc->cy);
 	if (res != AMF_OK)
-		throw amf_error("AMFComponent::Init failed", res);
+		throw amf_error("AMFComponent::ReInit failed", res);
 
 	return true;
 
@@ -1693,6 +1708,9 @@
 	if (res == AMF_OK) {
 		caps->GetProperty(AMF_VIDEO_ENCODER_HEVC_CAP_MAX_THROUGHPUT,
 				  &enc->max_throughput);
+		caps->GetProperty(
+			AMF_VIDEO_ENCODER_HEVC_CAP_REQUESTED_THROUGHPUT,
+			&enc->requested_throughput);
 	}
 
 	const bool is10bit = enc->amf_format == AMF_SURFACE_P010;
@@ -1835,8 +1853,7 @@
 	amf_encoder_info.get_name = amf_hevc_get_name;
 	amf_encoder_info.create = amf_hevc_create_texencode;
 	amf_encoder_info.destroy = amf_destroy;
-	/* FIXME: Figure out why encoder does not survive reconfiguration
-	amf_encoder_info.update = amf_hevc_update; */
+	amf_encoder_info.update = amf_hevc_update;
 	amf_encoder_info.encode_texture = amf_encode_tex;
 	amf_encoder_info.get_defaults = amf_defaults;
 	amf_encoder_info.get_properties = amf_hevc_properties;
@@ -1947,12 +1964,17 @@
 	int64_t cq_level = obs_data_get_int(settings, "cqp");
 	const char *rc_str = obs_data_get_string(settings, "rate_control");
 	int rc = get_av1_rate_control(rc_str);
+	AMF_RESULT res = AMF_OK;
 
 	amf_av1_update_data(enc, rc, bitrate * 1000, cq_level);
 
-	AMF_RESULT res = enc->amf_encoder->ReInit(enc->cx, enc->cy);
+	res = enc->amf_encoder->Flush();
 	if (res != AMF_OK)
-		throw amf_error("AMFComponent::Init failed", res);
+		throw amf_error("AMFComponent::Flush failed", res);
+
+	res = enc->amf_encoder->ReInit(enc->cx, enc->cy);
+	if (res != AMF_OK)
+		throw amf_error("AMFComponent::ReInit failed", res);
 
 	return true;
 
@@ -2027,6 +2049,9 @@
 	if (res == AMF_OK) {
 		caps->GetProperty(AMF_VIDEO_ENCODER_AV1_CAP_MAX_THROUGHPUT,
 				  &enc->max_throughput);
+		caps->GetProperty(
+			AMF_VIDEO_ENCODER_AV1_CAP_REQUESTED_THROUGHPUT,
+			&enc->requested_throughput);
 	}
 
 	const bool is10bit = enc->amf_format == AMF_SURFACE_P010;
@@ -2153,8 +2178,7 @@
 	amf_encoder_info.get_name = amf_av1_get_name;
 	amf_encoder_info.create = amf_av1_create_texencode;
 	amf_encoder_info.destroy = amf_destroy;
-	/* FIXME: Figure out why encoder does not survive reconfiguration
-	amf_encoder_info.update = amf_av1_update; */
+	amf_encoder_info.update = amf_av1_update;
 	amf_encoder_info.encode_texture = amf_encode_tex;
 	amf_encoder_info.get_defaults = amf_av1_defaults;
 	amf_encoder_info.get_properties = amf_av1_properties;

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/CMakeLists.txt -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/CMakeLists.txt Changed

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/cmake/legacy.cmake -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/cmake/legacy.cmake Changed

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/docs/generated/protocol.json -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/docs/generated/protocol.json Changed

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/docs/generated/protocol.md -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/docs/generated/protocol.md Changed

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler.cpp -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler.cpp Changed

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler_Scenes.cpp -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler_Scenes.cpp Changed

obs-studio-29.1.2.tar.xz/plugins/obs-websocket/src/requesthandler/types/RequestStatus.h -> obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/requesthandler/types/RequestStatus.h Changed

obs-studio-29.1.2.tar.xz/plugins/text-freetype2/text-freetype2.c -> obs-studio-29.1.3.tar.xz/plugins/text-freetype2/text-freetype2.c Changed

obs-studio-29.1.2.tar.xz/plugins/text-freetype2/text-functionality.c -> obs-studio-29.1.3.tar.xz/plugins/text-freetype2/text-functionality.c Changed

obs-studio-29.1.2.tar.xz/plugins/win-capture/compat-helpers.c -> obs-studio-29.1.3.tar.xz/plugins/win-capture/compat-helpers.c Changed

obs-studio-29.1.2.tar.xz/plugins/win-capture/data/compatibility.json -> obs-studio-29.1.3.tar.xz/plugins/win-capture/data/compatibility.json Changed

obs-studio-29.1.2.tar.xz/plugins/win-capture/data/package.json -> obs-studio-29.1.3.tar.xz/plugins/win-capture/data/package.json Changed

Changes of Revision 33