X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cef_capture.cpp;h=b6b8cca489ff782182541101a1db372ac1ab735a;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=76c5c7f753c8630ff6a796de58ac660daff65bf1;hpb=a1fac4049d79171dc40f0cd416c1358fd4dc2d3c;p=nageru

diff --git a/cef_capture.cpp b/cef_capture.cpp
index 76c5c7f..b6b8cca 100644
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -22,7 +22,7 @@ using namespace bmusb;
 extern CefRefPtr<NageruCefApp> cef_app;
 
 CEFCapture::CEFCapture(const string &url, unsigned width, unsigned height)
-	: cef_client(new NageruCEFClient(width, height, this)),
+	: cef_client(new NageruCEFClient(this)),
 	  width(width),
 	  height(height),
 	  start_url(url)
@@ -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));
 	}
@@ -60,6 +64,7 @@ void CEFCapture::set_url(const string &url)
 void CEFCapture::reload()
 {
 	post_to_cef_ui_thread([this] {
+		loaded = false;
 		browser->Reload();
 	});
 }
@@ -85,6 +90,26 @@ void CEFCapture::execute_javascript_async(const string &js)
 	});
 }
 
+void CEFCapture::resize(unsigned width, unsigned height)
+{
+	lock_guard<mutex> lock(resolution_mutex);
+	this->width = width;
+	this->height = height;
+}
+
+void CEFCapture::request_new_frame()
+{
+	// 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] {
+		lock_guard<recursive_mutex> lock(browser_mutex);
+		if (browser != nullptr) {  // Could happen if we are shutting down.
+			browser->GetHost()->Invalidate(PET_VIEW);
+		}
+	}, 16);
+}
+
 void CEFCapture::OnPaint(const void *buffer, int width, int height)
 {
 	steady_clock::time_point timestamp = steady_clock::now();
@@ -99,16 +124,23 @@ void CEFCapture::OnPaint(const void *buffer, int width, int height)
 	video_format.is_connected = true;
 
 	FrameAllocator::Frame video_frame = video_frame_allocator->alloc_frame();
-	if (video_frame.data != nullptr) {
+	if (video_frame.data == nullptr) {
+		// We lost a frame, so we need to invalidate the entire thing.
+		// (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.)
+		request_new_frame();
+		++timecode;
+	} else {
 		assert(video_frame.size >= unsigned(width * height * 4));
 		assert(!video_frame.interleaved);
 		memcpy(video_frame.data, buffer, width * height * 4);
 		video_frame.len = video_format.stride * height;
 		video_frame.received_timestamp = timestamp;
+		frame_callback(timecode++,
+			video_frame, 0, video_format,
+			FrameAllocator::Frame(), 0, AudioFormat());
 	}
-	frame_callback(timecode++,
-		video_frame, 0, video_format,
-		FrameAllocator::Frame(), 0, AudioFormat());
 }
 
 void CEFCapture::OnLoadEnd()
@@ -139,7 +171,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;
@@ -158,9 +190,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();
 }
 
@@ -214,6 +248,12 @@ void NageruCEFClient::OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType ty
 
 bool NageruCEFClient::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
 {
+	return parent->GetViewRect(rect);
+}
+
+bool CEFCapture::GetViewRect(CefRect &rect)
+{
+	lock_guard<mutex> lock(resolution_mutex);
 	rect = CefRect(0, 0, width, height);
 	return true;
 }