X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cef_capture.cpp;h=853c6b4916a6b1ddcfb4aa4b715f574f51e7cb40;hb=06608bb52fa8788a7a6498198143fc38fa83df44;hp=e46f0c065f7287e0dce70992a070cea557a0497d;hpb=4ed8afda0ec060a66ca6af76d15afe62af543849;p=nageru

diff --git a/cef_capture.cpp b/cef_capture.cpp
index e46f0c0..853c6b4 100644
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -39,11 +39,15 @@ CEFCapture::~CEFCapture()
 	}
 }
 
-void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
+void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func, int64_t delay_ms)
 {
-	lock_guard<mutex> lock(browser_mutex);
+	lock_guard<recursive_mutex> lock(browser_mutex);
 	if (browser != nullptr) {
-		CefPostTask(TID_UI, new CEFTaskAdapter(std::move(func)));
+		if (delay_ms <= 0) {
+			CefPostTask(TID_UI, new CEFTaskAdapter(std::move(func)));
+		} else {
+			CefPostDelayedTask(TID_UI, new CEFTaskAdapter(std::move(func)), delay_ms);
+		}
 	} else {
 		deferred_tasks.push_back(std::move(func));
 	}
@@ -112,9 +116,16 @@ void CEFCapture::OnPaint(const void *buffer, int width, int height)
 		// (CEF only sends OnPaint when there are actual changes,
 		// so we need to do this explicitly, or we could be stuck on an
 		// old frame forever if the image doesn't change.)
+		//
+		// By adding a delay, we make sure we don't get a new frame
+		// delivered immediately (we probably already are on the UI thread),
+		// where we couldn't really deal with it.
 		post_to_cef_ui_thread([this] {
-			browser->GetHost()->Invalidate(PET_VIEW);
-		});
+			lock_guard<recursive_mutex> lock(browser_mutex);
+			if (browser != nullptr) {  // Could happen if we are shutting down.
+				browser->GetHost()->Invalidate(PET_VIEW);
+			}
+		}, 16);
 		++timecode;
 	} else {
 		assert(video_frame.size >= unsigned(width * height * 4));
@@ -156,7 +167,7 @@ void CEFCapture::start_bm_capture()
 	cef_app->initialize_cef();
 
 	CefPostTask(TID_UI, new CEFTaskAdapter([this]{
-		lock_guard<mutex> lock(browser_mutex);
+		lock_guard<recursive_mutex> lock(browser_mutex);
 
 		CefBrowserSettings browser_settings;
 		browser_settings.web_security = cef_state_t::STATE_DISABLED;
@@ -175,9 +186,11 @@ void CEFCapture::start_bm_capture()
 
 void CEFCapture::stop_dequeue_thread()
 {
-	lock_guard<mutex> lock(browser_mutex);
-	cef_app->close_browser(browser);
-	browser = nullptr;  // Or unref_cef() will be sad.
+	{
+		lock_guard<recursive_mutex> lock(browser_mutex);
+		cef_app->close_browser(browser);
+		browser = nullptr;  // Or unref_cef() will be sad.
+	}
 	cef_app->unref_cef();
 }