ustreamer-v4p: bring back busy message

pikvm · Mar 27, 2024 · b6fac26 · b6fac26
1 parent e6ebc12
commit b6fac26
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/libs/drm/drm.c b/src/libs/drm/drm.c
@@ -337,12 +337,7 @@ int us_drm_expose_stub(us_drm_s *drm, us_drm_stub_e stub, const us_capture_s *ca
 			break;
 		};
 		case US_DRM_STUB_BAD_FORMAT:
-			DRAW_MSG(
-				"=== PiKVM ==="
-				"\n \n< UNSUPPORTED CAPTURE FORMAT >"
-				"\n \nIt shouldn't happen ever."
-				"\n \nPlease check the logs and report a bug:"
-				"\n \n- https://github.com/pikvm/pikvm -");
+			DRAW_MSG("=== PiKVM ===\n \n< UNSUPPORTED CAPTURE FORMAT >");
 			break;
 		case US_DRM_STUB_NO_SIGNAL:
 			DRAW_MSG("=== PiKVM ===\n \n< NO SIGNAL >");

diff --git a/src/v4p/main.c b/src/v4p/main.c
@@ -177,17 +177,19 @@ static void _main_loop(void) {
 	while (!atomic_load(&_g_stop)) {
 #		define CHECK(x_arg) if ((x_arg) < 0) { goto close; }
 
-		if (atomic_load(&_g_ustreamer_online)) {
+		if (drm_opened <= 0) {
 			blank_at_ts = 0;
-			US_ONCE({ US_LOG_INFO("DRM: Online stream is active, pausing the service ..."); });
-			goto close;
+			CHECK(drm_opened = us_drm_open(drm, NULL));
 		}
 
-		if (drm_opened <= 0) {
+		if (atomic_load(&_g_ustreamer_online)) {
 			blank_at_ts = 0;
-			CHECK(drm_opened = us_drm_open(drm, NULL));
+			US_ONCE({ US_LOG_INFO("DRM: Online stream is active, pausing the service ..."); });
+			CHECK(us_drm_wait_for_vsync(drm));
+			CHECK(us_drm_expose_stub(drm, US_DRM_STUB_BUSY, NULL));
+			_slowdown();
+			continue;
 		}
-		assert(drm_opened > 0);
 
 		if (us_capture_open(cap) < 0) {
 			ldf now_ts = us_get_now_monotonic();