sinkclient: add lock

Change-Id: I7b7b67008bd1b3df9ec6d17c831acca753ba5662

bin/jni/videomanager.i

@@ -303,7 +303,9 @@ JNIEXPORT void JNICALL Java_net_jami_daemon_JamiServiceJNI_setNativeWindowGeomet
 
 void AndroidDisplayCb(ANativeWindow *window, std::unique_ptr<DRing::FrameBuffer> frame)
 {
-    std::lock_guard<std::mutex> guard(windows_mutex);
+    std::unique_lock<std::mutex> guard(windows_mutex, std::defer_lock);
+    if (!guard.try_lock())
+        return;
     try {
         auto& i = windows.at(window);
         ANativeWindow_Buffer buffer;

src/media/video/sinkclient.cpp

@@ -435,6 +435,7 @@ SinkClient::update(Observable<std::shared_ptr<MediaFrame>>* /*obs*/,
 #if HAVE_SHM
         shm_->renderFrame(*frame);
 #endif
+        std::lock_guard<std::mutex> lock(mtx_);
         if (target_.pull) {
             VideoFrame dst;
             width = frame->width();

src/media/video/sinkclient.h

@@ -76,7 +76,10 @@ public:
     void setFrameSize(int width, int height);
     void setFramePosition(int x, int y);
 
-    void registerTarget(const DRing::SinkTarget& target) noexcept { target_ = target; }
+    void registerTarget(const DRing::SinkTarget& target) noexcept {
+        std::lock_guard<std::mutex> lock(mtx_);
+        target_ = target;
+    }
     void registerAVTarget(const DRing::AVSinkTarget& target) noexcept { avTarget_ = target; }
 
 private:
@@ -93,6 +96,7 @@ private:
     DRing::AVSinkTarget avTarget_;
     std::unique_ptr<VideoScaler> scaler_;
     std::unique_ptr<MediaFilter> filter_;
+    std::mutex mtx_;
 
     void setRotation(int rotation);