Release Nageru 1.7.2.

[nageru] / cef_capture.h

diff --git a/cef_capture.h b/cef_capture.h
index c497179d72e127077e4abb193e34f720ed7ea141..29dededf7b60ad8696dfaec10c71c7f7e84844f4 100644 (file)
--- a/cef_capture.h
+++ b/cef_capture.h
@@ -35,8 +35,8 @@ class CEFCapture;
 class NageruCEFClient : public CefClient, public CefRenderHandler, public CefLoadHandler
 {
 public:
-       NageruCEFClient(int width, int height, CEFCapture *parent)
-               : width(width), height(height), parent(parent) {}
+       NageruCEFClient(CEFCapture *parent)
+               : parent(parent) {}
 
        CefRefPtr<CefRenderHandler> GetRenderHandler() override
        {
@@ -52,14 +52,13 @@ public:
 
        void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type, const RectList &dirtyRects, const void *buffer, int width, int height) override;
 
-       bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect);
+       bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) override;
 
        // CefLoadHandler.
 
        void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) override;
 
 private:
-       int width, height;
        CEFCapture *parent;
 
        IMPLEMENT_REFCOUNTING(NageruCEFClient);
@@ -85,9 +84,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.
@@ -146,7 +148,7 @@ public:
                assert(pixel_format == bmusb::PixelFormat_8BitBGRA);
        }
 
-       bmusb::PixelFormat get_current_pixel_format() const
+       bmusb::PixelFormat get_current_pixel_format() const override
        {
                return bmusb::PixelFormat_8BitBGRA;
        }
@@ -164,10 +166,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 +189,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>.