extern CefRefPtr<NageruCefApp> cef_app;
CEFCapture::CEFCapture(const string &url, unsigned width, unsigned height)
- : cef_client(new NageruCEFClient(width, height, this)),
+ : cef_client(new NageruCEFClient(this)),
width(width),
height(height),
start_url(url)
}
}
-void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
+void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func, int64_t delay_ms)
{
- lock_guard<mutex> lock(browser_mutex);
+ lock_guard<recursive_mutex> lock(browser_mutex);
if (browser != nullptr) {
- CefPostTask(TID_UI, new CEFTaskAdapter(std::move(func)));
+ if (delay_ms <= 0) {
+ CefPostTask(TID_UI, new CEFTaskAdapter(std::move(func)));
+ } else {
+ CefPostDelayedTask(TID_UI, new CEFTaskAdapter(std::move(func)), delay_ms);
+ }
} else {
deferred_tasks.push_back(std::move(func));
}
});
}
+void CEFCapture::resize(unsigned width, unsigned height)
+{
+ lock_guard<mutex> lock(resolution_mutex);
+ this->width = width;
+ this->height = height;
+}
+
+void CEFCapture::request_new_frame()
+{
+ // By adding a delay, we make sure we don't get a new frame
+ // delivered immediately (we probably already are on the UI thread),
+ // where we couldn't really deal with it.
+ post_to_cef_ui_thread([this] {
+ lock_guard<recursive_mutex> lock(browser_mutex);
+ if (browser != nullptr) { // Could happen if we are shutting down.
+ browser->GetHost()->Invalidate(PET_VIEW);
+ }
+ }, 16);
+}
+
void CEFCapture::OnPaint(const void *buffer, int width, int height)
{
steady_clock::time_point timestamp = steady_clock::now();
// (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);
- });
+ request_new_frame();
++timecode;
} else {
assert(video_frame.size >= unsigned(width * height * 4));
cef_app->initialize_cef();
CefPostTask(TID_UI, new CEFTaskAdapter([this]{
- lock_guard<mutex> lock(browser_mutex);
+ lock_guard<recursive_mutex> lock(browser_mutex);
CefBrowserSettings browser_settings;
browser_settings.web_security = cef_state_t::STATE_DISABLED;
void CEFCapture::stop_dequeue_thread()
{
- lock_guard<mutex> lock(browser_mutex);
- cef_app->close_browser(browser);
- browser = nullptr; // Or unref_cef() will be sad.
+ {
+ lock_guard<recursive_mutex> lock(browser_mutex);
+ cef_app->close_browser(browser);
+ browser = nullptr; // Or unref_cef() will be sad.
+ }
cef_app->unref_cef();
}
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;
}