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

[nageru] / cef_capture.cpp

diff --git a/cef_capture.cpp b/cef_capture.cpp
index 9c4f68c8f6d875ea40a1e03b3d7b015b392efea0..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<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));
        }
@@ -52,6 +56,7 @@ void CEFCapture::post_to_cef_ui_thread(std::function<void()> &&func)
 void CEFCapture::set_url(const string &url)
 {
        post_to_cef_ui_thread([this, url] {
+               loaded = false;
                browser->GetMainFrame()->LoadURL(url);
        });
 }
@@ -59,6 +64,7 @@ void CEFCapture::set_url(const string &url)
 void CEFCapture::reload()
 {
        post_to_cef_ui_thread([this] {
+               loaded = false;
                browser->Reload();
        });
 }
@@ -71,6 +77,39 @@ void CEFCapture::set_max_fps(int 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::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();
@@ -85,16 +124,36 @@ void CEFCapture::OnPaint(const void *buffer, int width, int height)
        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.)
+               request_new_frame();
+               ++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.
@@ -112,7 +171,7 @@ void CEFCapture::start_bm_capture()
        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;
@@ -131,9 +190,11 @@ void CEFCapture::start_bm_capture()
 
 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();
 }
 
@@ -187,6 +248,17 @@ void NageruCEFClient::OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType ty
 
 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;
 }
+
+void NageruCEFClient::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode)
+{
+       parent->OnLoadEnd();
+}