Fix an issue where the mixer lagging too much behind CEF would cause us to display...

[nageru] / cef_capture.cpp

diff --git a/cef_capture.cpp b/cef_capture.cpp
index c05c2953deff7cc3837f1f203917eee8f734b843..c52e3a45ddccf92f18b6fb489a80d26b66f05ebc 100644 (file)
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -39,6 +39,52 @@ 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] {
+               loaded = false;
+               browser->GetMainFrame()->LoadURL(url);
+       });
+}
+
+void CEFCapture::reload()
+{
+       post_to_cef_ui_thread([this] {
+               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::OnPaint(const void *buffer, int width, int height)
 {
        steady_clock::time_point timestamp = steady_clock::now();
@@ -47,22 +93,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.
@@ -79,14 +147,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 = max_fps;
+
+               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()
@@ -108,7 +184,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;
 
@@ -150,3 +226,8 @@ bool NageruCEFClient::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
        rect = CefRect(0, 0, width, height);
        return true;
 }
+
+void NageruCEFClient::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode)
+{
+       parent->OnLoadEnd();
+}