X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cef_capture.h;h=30cc4879593eaece48df9e315f755d51c38de3bf;hb=b9feb66845bf24465b7671ac9ff7a52b88f6032b;hp=c497179d72e127077e4abb193e34f720ed7ea141;hpb=a1fac4049d79171dc40f0cd416c1358fd4dc2d3c;p=nageru

diff --git a/cef_capture.h b/cef_capture.h
index c497179..30cc487 100644
--- a/cef_capture.h
+++ b/cef_capture.h
@@ -85,9 +85,12 @@ public:
 	void reload();
 	void set_max_fps(int max_fps);
 	void execute_javascript_async(const std::string &js);
+	void resize(unsigned width, unsigned height);
+	void request_new_frame();
 
+	// Callbacks from NageruCEFClient.
 	void OnPaint(const void *buffer, int width, int height);
-
+	bool GetViewRect(CefRect &rect);
 	void OnLoadEnd();
 
 	// CaptureInterface.
@@ -164,10 +167,16 @@ public:
 	uint32_t get_current_audio_input() const override { return 0; }
 
 private:
-	void post_to_cef_ui_thread(std::function<void()> &&func);
+	void post_to_cef_ui_thread(std::function<void()> &&func, int64_t delay_ms = 0);
 
 	CefRefPtr<NageruCEFClient> cef_client;
-	unsigned width, height;
+
+	// Needs to be different from browser_mutex below, since GetViewRect
+	// can be called unpredictably from when we are already holding
+	// <browser_mutex>.
+	std::mutex resolution_mutex;
+	unsigned width, height;  // Under <resolution_mutex>.
+
 	int card_index = -1;
 
 	bool has_dequeue_callbacks = false;
@@ -181,7 +190,9 @@ private:
 	std::string description, start_url;
 	std::atomic<int> max_fps{60};
 
-	std::mutex browser_mutex;
+	// Needs to be recursive because the lambda in OnPaint could cause
+	// OnPaint itself to be called.
+	std::recursive_mutex browser_mutex;
 	CefRefPtr<CefBrowser> browser;  // Under <browser_mutex>.
 
 	// Tasks waiting for <browser> to get ready. Under <browser_mutex>.