Request 6328 (accepted)

Overview

Request 6328 (accepted)

- Update to version 32.0.1:
* libobs: Update version to 32.0.1
* frontend: Fix runtime check failure issue
* libobs: Log monitoring audio deduplication
* libobs: Fix for monitoring deduplication edge case
* frontend: Enable multitrack RTMP option for custom RTMP services
* obs-browser: Update version to 2.26.2
* CI: Pin patch generation workflows to windows-2022

Created by darix about 1 month ago
In state accepted
Package maintainers: boombatower, darix, and frispete

Submit obs-studio

Submit package home:darix:branches:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-32.0.0.tar.xz/.github/workflows/dispatch.yaml -> obs-studio-32.0.1.tar.xz/.github/workflows/dispatch.yaml Changed

obs-studio-32.0.0.tar.xz/.github/workflows/publish.yaml -> obs-studio-32.0.1.tar.xz/.github/workflows/publish.yaml Changed

obs-studio-32.0.0.tar.xz/frontend/components/SourceTreeItem.cpp -> obs-studio-32.0.1.tar.xz/frontend/components/SourceTreeItem.cpp Changed

obs-studio-32.0.0.tar.xz/frontend/settings/OBSBasicSettings.cpp -> obs-studio-32.0.1.tar.xz/frontend/settings/OBSBasicSettings.cpp Changed

@@ -5591,8 +5591,6 @@
 #endif
 }
 
-extern bool MultitrackVideoDeveloperModeEnabled();
-
 void OBSBasicSettings::UpdateMultitrackVideo()
 {
 	// Technically, it should currently be safe to toggle multitrackVideo
@@ -5615,15 +5613,6 @@
 			ui->enableMultitrackVideo->setChecked(false);
 	}
 
-	// Enhanced Broadcasting works on Windows, Apple Silicon Macs, and Linux.
-	// For other OS variants, only enable the GUI controls if developer mode was invoked.
-#if !defined(_WIN32) && !(defined(__APPLE__) && defined(__aarch64__)) && !defined(__linux__)
-	available = available && MultitrackVideoDeveloperModeEnabled();
-#endif
-
-	if (IsCustomService())
-		available = available && MultitrackVideoDeveloperModeEnabled();
-
 	ui->multitrackVideoGroupBox->setVisible(available);
 
 	ui->enableMultitrackVideo->setEnabled(toggle_available);
@@ -5644,10 +5633,10 @@
 							  !ui->multitrackVideoMaximumVideoTracksAuto->isChecked());
 	ui->multitrackVideoAdditionalCanvas->setEnabled(toggle_available && ui->enableMultitrackVideo->isChecked());
 
-	ui->multitrackVideoStreamDumpEnable->setVisible(available && MultitrackVideoDeveloperModeEnabled());
-	ui->multitrackVideoConfigOverrideEnable->setVisible(available && MultitrackVideoDeveloperModeEnabled());
-	ui->multitrackVideoConfigOverrideLabel->setVisible(available && MultitrackVideoDeveloperModeEnabled());
-	ui->multitrackVideoConfigOverride->setVisible(available && MultitrackVideoDeveloperModeEnabled());
+	ui->multitrackVideoStreamDumpEnable->setVisible(available && IsCustomService());
+	ui->multitrackVideoConfigOverrideEnable->setVisible(available && IsCustomService());
+	ui->multitrackVideoConfigOverrideLabel->setVisible(available && IsCustomService());
+	ui->multitrackVideoConfigOverride->setVisible(available && IsCustomService());
 
 	ui->multitrackVideoStreamDumpEnable->setEnabled(toggle_available && ui->enableMultitrackVideo->isChecked());
 	ui->multitrackVideoConfigOverrideEnable->setEnabled(toggle_available && ui->enableMultitrackVideo->isChecked());

obs-studio-32.0.0.tar.xz/frontend/utility/BasicOutputHandler.cpp -> obs-studio-32.0.1.tar.xz/frontend/utility/BasicOutputHandler.cpp Changed

obs-studio-32.0.0.tar.xz/frontend/utility/MultitrackVideoOutput.cpp -> obs-studio-32.0.1.tar.xz/frontend/utility/MultitrackVideoOutput.cpp Changed

obs-studio-32.0.0.tar.xz/libobs/obs-audio.c -> obs-studio-32.0.1.tar.xz/libobs/obs-audio.c Changed

@@ -63,6 +63,11 @@
 			if (strcmp(dev_id, audio->monitoring_device_id) == 0) {
 				audio->prevent_monitoring_duplication = true;
 				audio->monitoring_duplicating_source = s;
+				if (!audio->monitoring_duplication_prevented_on_prev_tick)
+					blog(LOG_INFO,
+					     "Device for 'Audio Output Capture' source is also used for audio"
+					     " monitoring:\nDeduplication logic is being applied to all monitored"
+					     " sources.\n");
 			}
 			obs_data_release(settings);
 		}
@@ -544,7 +549,8 @@
 	bool output_capture_unmuted = !audio->monitoring_duplicating_source->user_muted;
 
 	if (audio->prevent_monitoring_duplication && output_capture_unmuted) {
-		if (source->monitoring_type == OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT) {
+		if (source->monitoring_type == OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT &&
+		    source != audio->monitoring_duplicating_source) {
 			return true;
 		}
 	}
@@ -576,6 +582,7 @@
 
 	da_resize(audio->render_order, 0);
 	da_resize(audio->root_nodes, 0);
+	audio->monitoring_duplication_prevented_on_prev_tick = audio->prevent_monitoring_duplication;
 	audio->prevent_monitoring_duplication = false;
 	audio->monitoring_duplicating_source = NULL;

obs-studio-32.0.0.tar.xz/libobs/obs-config.h -> obs-studio-32.0.1.tar.xz/libobs/obs-config.h Changed

obs-studio-32.0.0.tar.xz/libobs/obs-internal.h -> obs-studio-32.0.1.tar.xz/libobs/obs-internal.h Changed

obs-studio-32.0.0.tar.xz/libobs/obs.c -> obs-studio-32.0.1.tar.xz/libobs/obs.c Changed

obs-studio-32.0.0.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-32.0.1.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-32.0.0.tar.xz/plugins/obs-browser/obs-browser-source.cpp -> obs-studio-32.0.1.tar.xz/plugins/obs-browser/obs-browser-source.cpp Changed

Build Results
RPM Lint

Refresh

Comments for request 6328 0

Request History

darix created request about 1 month ago

darix accepted request about 1 month ago