Support audio-only FFmpeg inputs. Somewhat wonky, though.

[nageru] / cef_capture.cpp

diff --git a/cef_capture.cpp b/cef_capture.cpp
index ff978f288640d8036cb33e1479b5e5c39c6a07d8..b6b8cca489ff782182541101a1db372ac1ab735a 100644 (file)
--- a/cef_capture.cpp
+++ b/cef_capture.cpp
@@ -22,7 +22,7 @@ using namespace bmusb;
 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)
@@ -39,11 +39,15 @@ CEFCapture::~CEFCapture()
        }
 }
 
-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<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));
        }
@@ -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<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();
@@ -112,12 +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] {
-                       lock_guard<recursive_mutex> lock(browser_mutex);
-                       if (browser != nullptr) {  // Could happen if we are shutting down.
-                               browser->GetHost()->Invalidate(PET_VIEW);
-                       }
-               });
+               request_new_frame();
                ++timecode;
        } else {
                assert(video_frame.size >= unsigned(width * height * 4));