fix stop stream detection

Author: summeroff

obs-studio-server/source/nodeobs_autoconfig.cpp

@@ -617,8 +617,7 @@ void autoConfig::TestBandwidthThreadV2(void)
 					ul.unlock();
 					std::this_thread::sleep_for(std::chrono::milliseconds(250));
 				}
-				dataWaitMs = (int)std::chrono::duration_cast<std::chrono::milliseconds>(
-					std::chrono::steady_clock::now() - dataStart).count();
+				dataWaitMs = (int)std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - dataStart).count();
 			}
 
 			if (!gotError) {
@@ -1732,11 +1731,25 @@ static void applyResults()
 		v.fps_den = (uint32_t)(runContext.idealFPSDen ? runContext.idealFPSDen : 1);
 		v.output_width = ((uint32_t)runContext.idealResolutionCX) & 0xFFFFFFFC;
 		v.output_height = ((uint32_t)runContext.idealResolutionCY) & 0xFFFFFFFE;
+
+		blog(LOG_INFO, "applyResults: ctx=%p current=%ux%u@%u/%u requested=%ux%u@%u/%u", video, video->output_width,
+		     video->output_height, video->fps_num, video->fps_den, v.output_width, v.output_height, v.fps_num, v.fps_den);
+
+		// Skip the libobs call when nothing changes — the common case where
+		// autoconfig picks the resolution/FPS the canvas is already running at.
+		// obs_set_video_info would otherwise return OBS_VIDEO_CURRENTLY_ACTIVE
+		// for any active video context (e.g. running preview).
+		if (video->fps_num == v.fps_num && video->fps_den == v.fps_den && video->output_width == v.output_width &&
+		    video->output_height == v.output_height) {
+			blog(LOG_INFO, "applyResults: ctx=%p no change, skipping obs_set_video_info", video);
+			continue;
+		}
+
 		int ret = obs_set_video_info(video, &v);
-		std::lock_guard<std::mutex> lock(eventsMutex);
-		events.push(AutoConfigInfo("applied", ret == OBS_VIDEO_SUCCESS ? "video" : ("video_failed_ret_" + std::to_string(ret)), (double)ret));
+		blog(ret == OBS_VIDEO_SUCCESS ? LOG_INFO : LOG_WARNING, "applyResults: ctx=%p obs_set_video_info returned %d", video, ret);
 		if (ret != OBS_VIDEO_SUCCESS) {
-			blog(LOG_WARNING, "applyResults: obs_set_video_info returned %d", ret);
+			std::lock_guard<std::mutex> lock(eventsMutex);
+			events.push(AutoConfigInfo("error", "video_failed_ret_" + std::to_string(ret), 0));
 		}
 	}
 
@@ -1759,8 +1772,7 @@ static void applyResults()
 			obs_data_set_string(settings, "server", targetServer.c_str());
 			obs_service_update(st.streaming->service, settings);
 			obs_data_release(settings);
-			std::lock_guard<std::mutex> lock(eventsMutex);
-			events.push(AutoConfigInfo("applied", "service", 0));
+			blog(LOG_INFO, "applyResults: target %llu: applied service server '%s'", st.id, targetServer.c_str());
 		}
 
 		// Streaming bitrate — three caps applied in order:
@@ -1794,8 +1806,7 @@ static void applyResults()
 			obs_data_set_int(encSettings, "bitrate", (long long)finalBitrate);
 			obs_encoder_update(st.streaming->videoEncoder, encSettings);
 			obs_data_release(encSettings);
-			std::lock_guard<std::mutex> lock(eventsMutex);
-			events.push(AutoConfigInfo("applied", "video_encoder", 0));
+			blog(LOG_INFO, "applyResults: target %llu: applied video encoder bitrate %llu", st.id, finalBitrate);
 		}
 
 		// Encoder type mismatch log (per-target)
@@ -1818,8 +1829,7 @@ static void applyResults()
 				obs_data_set_int(encSettings, "bitrate", (long long)runContext.idealBitrate);
 				obs_encoder_update(recording->videoEncoder, encSettings);
 				obs_data_release(encSettings);
-				std::lock_guard<std::mutex> lock(eventsMutex);
-				events.push(AutoConfigInfo("applied", "recording_video_encoder", 0));
+				blog(LOG_INFO, "applyResults: applied recording video encoder bitrate %llu", runContext.idealBitrate);
 			}
 		});
 	}

obs-studio-server/source/osn-streaming.cpp

@@ -24,6 +24,8 @@
 #include "osn-encoders.hpp"
 //os_gettime_ns
 #include <util/platform.h>
+#include <chrono>
+#include <thread>
 
 osn::Streaming::~Streaming()
 {
@@ -79,8 +81,18 @@ void osn::Streaming::testBandwidth(bool &gotError)
 
 void osn::Streaming::CleanTestMode()
 {
-	if (GetOutput() && obs_output_active(GetOutput())) {
-		obs_output_stop(GetOutput());
+	if (GetOutput()) {
+		if (obs_output_active(GetOutput())) {
+			obs_output_stop(GetOutput());
+		}
+		// obs_output_stop is asynchronous: the output stays active until its
+		// internal stop thread finishes flushing. Block here so callers
+		// (autoconfig SaveSettings -> applyResults -> obs_set_video_info)
+		// don't race with OBS_VIDEO_CURRENTLY_ACTIVE (-4).
+		const auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(3);
+		while (obs_output_active(GetOutput()) && std::chrono::steady_clock::now() < deadline) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(20));
+		}
 	}
 
 	if (service && originalServiceSettings) {