X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cef_capture.cpp;h=e46f0c065f7287e0dce70992a070cea557a0497d;hb=16e654819e2254ef045b60b7751a918558c4a13a;hp=a2f230aae9af610ec6710278b33f1ccbbe462472;hpb=cd48c8ab6d7425d4b4d9fdb2493da69b44848c9e;p=nageru

diff --git a/cef_capture.cpp b/cef_capture.cpp
index a2f230a..e46f0c0 100644
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -52,10 +52,47 @@ 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);
 	});
 }
 
+void CEFCapture::reload()
+{
+	post_to_cef_ui_thread([this] {
+		loaded = false;
+		browser->Reload();
+	});
+}
+
+void CEFCapture::set_max_fps(int max_fps)
+{
+	post_to_cef_ui_thread([this, max_fps] {
+		browser->GetHost()->SetWindowlessFrameRate(max_fps);
+		this->max_fps = 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();
@@ -64,22 +101,44 @@ void CEFCapture::OnPaint(const void *buffer, int width, int height)
 	video_format.width = width;
 	video_format.height = height;
 	video_format.stride = width * 4;
-	video_format.frame_rate_nom = 60;  // FIXME
+	video_format.frame_rate_nom = max_fps;
 	video_format.frame_rate_den = 1;
 	video_format.has_signal = true;
 	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.
@@ -102,7 +161,7 @@ void CEFCapture::start_bm_capture()
 		CefBrowserSettings browser_settings;
 		browser_settings.web_security = cef_state_t::STATE_DISABLED;
 		browser_settings.webgl = cef_state_t::STATE_ENABLED;
-		browser_settings.windowless_frame_rate = 60;
+		browser_settings.windowless_frame_rate = max_fps;
 
 		CefWindowInfo window_info;
 		window_info.SetAsWindowless(0);
@@ -133,7 +192,7 @@ std::map<uint32_t, VideoMode> CEFCapture::get_available_video_modes() const
 	mode.autodetect = false;
 	mode.width = width;
 	mode.height = height;
-	mode.frame_rate_num = 60;  // FIXME
+	mode.frame_rate_num = max_fps;
 	mode.frame_rate_den = 1;
 	mode.interlaced = false;
 
@@ -172,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();
+}