Implement HTMLInput::set_url().

diff --git a/cef_capture.cpp b/cef_capture.cpp
index c05c2953deff7cc3837f1f203917eee8f734b843..a2f230aae9af610ec6710278b33f1ccbbe462472 100644 (file)
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -39,6 +39,23 @@ CEFCapture::~CEFCapture()
        }
 }
 
+void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
+{
+       lock_guard<mutex> lock(browser_mutex);
+       if (browser != nullptr) {
+               CefPostTask(TID_UI, new CEFTaskAdapter(std::move(func)));
+       } else {
+               deferred_tasks.push_back(std::move(func));
+       }
+}
+
+void CEFCapture::set_url(const string &url)
+{
+       post_to_cef_ui_thread([this, url] {
+               browser->GetMainFrame()->LoadURL(url);
+       });
+}
+
 void CEFCapture::OnPaint(const void *buffer, int width, int height)
 {
        steady_clock::time_point timestamp = steady_clock::now();
@@ -79,14 +96,22 @@ void CEFCapture::start_bm_capture()
 {
        cef_app->initialize_cef();
 
-       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;
-
-       CefWindowInfo window_info;
-       window_info.SetAsWindowless(0);
-       CefBrowserHost::CreateBrowser(window_info, cef_client, start_url, browser_settings, nullptr);
+       CefPostTask(TID_UI, new CEFTaskAdapter([this]{
+               lock_guard<mutex> lock(browser_mutex);
+
+               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;
+
+               CefWindowInfo window_info;
+               window_info.SetAsWindowless(0);
+               browser = CefBrowserHost::CreateBrowserSync(window_info, cef_client, start_url, browser_settings, nullptr);
+               for (function<void()> &task : deferred_tasks) {
+                       task();
+               }
+               deferred_tasks.clear();
+       }));
 }
 
 void CEFCapture::stop_dequeue_thread()

diff --git a/cef_capture.h b/cef_capture.h
index dc74b30d527c4c28d6d54cb2ec1431ed77039fde..8dc053dddf9bfc1e37ecb0e62dd8954b1a3ac617 100644 (file)
--- a/cef_capture.h
+++ b/cef_capture.h
@@ -69,6 +69,8 @@ public:
                return card_index;
        }
 
+       void set_url(const std::string &url);
+
        void OnPaint(const void *buffer, int width, int height);
 
        // CaptureInterface.
@@ -145,6 +147,8 @@ public:
        uint32_t get_current_audio_input() const override { return 0; }
 
 private:
+       void post_to_cef_ui_thread(std::function<void()> &&func);
+
        CefRefPtr<NageruCEFClient> cef_client;
        unsigned width, height;
        int card_index = -1;
@@ -159,6 +163,12 @@ private:
 
        std::string description, start_url;
 
+       std::mutex browser_mutex;
+       CefRefPtr<CefBrowser> browser;  // Under <browser_mutex>.
+
+       // Tasks waiting for <browser> to get ready. Under <browser_mutex>.
+       std::vector<std::function<void()>> deferred_tasks;
+
        int timecode = 0;
 };
 

diff --git a/nageru_cef_app.h b/nageru_cef_app.h
index dff98441db7b2f4e4cc0447a6560694b2d906f54..a120d5a72e74be25fa12978fe1f57b38d04612bb 100644 (file)
--- a/nageru_cef_app.h
+++ b/nageru_cef_app.h
@@ -33,8 +33,8 @@
 class CEFTaskAdapter : public CefTask
 {
 public:
-       CEFTaskAdapter(const std::function<void()>& func)
-               : func(func) {}
+       CEFTaskAdapter(const std::function<void()>&& func)
+               : func(std::move(func)) {}
        void Execute() override { func(); }
 
 private:

diff --git a/theme.cpp b/theme.cpp
index d43cc3299c529f759fcbd692fa98fec74465aabe..bc57b0d209cb329571c594ed904991c6ff57d150 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -422,6 +422,15 @@ int HTMLInput_new(lua_State* L)
        return ret;
 }
 
+int HTMLInput_set_url(lua_State* L)
+{
+       assert(lua_gettop(L) == 2);
+       CEFCapture **video_input = (CEFCapture **)luaL_checkudata(L, 1, "HTMLInput");
+       string new_url = checkstdstring(L, 2);
+       (*video_input)->set_url(new_url);
+       return 0;
+}
+
 int HTMLInput_get_signal_num(lua_State* L)
 {
        assert(lua_gettop(L) == 1);
@@ -639,8 +648,9 @@ const luaL_Reg VideoInput_funcs[] = {
 };
 
 const luaL_Reg HTMLInput_funcs[] = {
-       // TODO: reload, set_url, execute_javascript, perhaps change_framerate?
+       // TODO: reload, execute_javascript, perhaps set_max_fps?
        { "new", HTMLInput_new },
+       { "set_url", HTMLInput_set_url },
        { "get_signal_num", HTMLInput_get_signal_num },
        { NULL, NULL }
 };