X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cef_capture.cpp;h=b6b8cca489ff782182541101a1db372ac1ab735a;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=e46f0c065f7287e0dce70992a070cea557a0497d;hpb=4ed8afda0ec060a66ca6af76d15afe62af543849;p=nageru diff --git a/cef_capture.cpp b/cef_capture.cpp index e46f0c0..b6b8cca 100644 --- a/cef_capture.cpp +++ b/cef_capture.cpp @@ -22,7 +22,7 @@ using namespace bmusb; extern CefRefPtr 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) @@ -39,11 +39,15 @@ CEFCapture::~CEFCapture() } } -void CEFCapture::post_to_cef_ui_thread(std::function &&func) +void CEFCapture::post_to_cef_ui_thread(std::function &&func, int64_t delay_ms) { - lock_guard lock(browser_mutex); + lock_guard 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)); } @@ -93,6 +97,19 @@ void CEFCapture::resize(unsigned width, unsigned height) 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 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(); @@ -112,9 +129,7 @@ void CEFCapture::OnPaint(const void *buffer, int width, int height) // (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)); @@ -156,7 +171,7 @@ void CEFCapture::start_bm_capture() cef_app->initialize_cef(); CefPostTask(TID_UI, new CEFTaskAdapter([this]{ - lock_guard lock(browser_mutex); + lock_guard lock(browser_mutex); CefBrowserSettings browser_settings; browser_settings.web_security = cef_state_t::STATE_DISABLED; @@ -175,9 +190,11 @@ void CEFCapture::start_bm_capture() void CEFCapture::stop_dequeue_thread() { - lock_guard lock(browser_mutex); - cef_app->close_browser(browser); - browser = nullptr; // Or unref_cef() will be sad. + { + lock_guard lock(browser_mutex); + cef_app->close_browser(browser); + browser = nullptr; // Or unref_cef() will be sad. + } cef_app->unref_cef(); }