X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cef_capture.cpp;h=e46f0c065f7287e0dce70992a070cea557a0497d;hb=6cc6c194b3eb245a04af531c7a6adb582673f2e7;hp=9c4f68c8f6d875ea40a1e03b3d7b015b392efea0;hpb=f1ce3c5618f769b1388b39c637877d242c8ddeed;p=nageru

diff --git a/cef_capture.cpp b/cef_capture.cpp
index 9c4f68c..e46f0c0 100644
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -52,6 +52,7 @@ void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
 void CEFCapture::set_url(const string &url)
 {
 	post_to_cef_ui_thread([this, url] {
+		loaded = false;
 		browser->GetMainFrame()->LoadURL(url);
 	});
 }
@@ -59,6 +60,7 @@ void CEFCapture::set_url(const string &url)
 void CEFCapture::reload()
 {
 	post_to_cef_ui_thread([this] {
+		loaded = false;
 		browser->Reload();
 	});
 }
@@ -71,6 +73,26 @@ void CEFCapture::set_max_fps(int max_fps)
 	});
 }
 
+void CEFCapture::execute_javascript_async(const string &js)
+{
+	post_to_cef_ui_thread([this, js] {
+		if (loaded) {
+			CefString script_url("<theme eval>");
+			int start_line = 1;
+			browser->GetMainFrame()->ExecuteJavaScript(js, script_url, start_line);
+		} else {
+			deferred_javascript.push_back(js);
+		}
+	});
+}
+
+void CEFCapture::resize(unsigned width, unsigned height)
+{
+	lock_guard<mutex> lock(resolution_mutex);
+	this->width = width;
+	this->height = height;
+}
+
 void CEFCapture::OnPaint(const void *buffer, int width, int height)
 {
 	steady_clock::time_point timestamp = steady_clock::now();
@@ -85,16 +107,38 @@ 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.)
+		post_to_cef_ui_thread([this] {
+			browser->GetHost()->Invalidate(PET_VIEW);
+		});
+		++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()
+{
+	post_to_cef_ui_thread([this] {
+		loaded = true;
+		for (const string &js : deferred_javascript) {
+			CefString script_url("<theme eval>");
+			int start_line = 1;
+			browser->GetMainFrame()->ExecuteJavaScript(js, script_url, start_line);
+		}
+		deferred_javascript.clear();
+	});
 }
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.
@@ -187,6 +231,17 @@ 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;
 }
+
+void NageruCEFClient::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode)
+{
+	parent->OnLoadEnd();
+}