Merge pull request mipops#835 from mipops/linux-capture-rebased

Linux capture rebased
MediaArea · Mar 26, 2024 · c5b7171 · c5b7171
2 parents a209b1f + 0e4473c
commit c5b7171
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/Source/Common/LinuxWrapper.cpp b/Source/Common/LinuxWrapper.cpp
@@ -7,6 +7,7 @@
 //---------------------------------------------------------------------------
 #include "Common/LinuxWrapper.h"
 
+#include <condition_variable>
 #include <ctime>
 #include <queue>
 #include <vector>
@@ -17,8 +18,6 @@
 #include <libavc1394/avc1394.h>
 #include <libavc1394/avc1394_vcr.h>
 
-#include <iostream>
-
 using namespace std;
 
 #define CTLVCR0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_TAPE_RECORDER | AVC1394_SUBUNIT_ID_0
@@ -37,6 +36,7 @@ atomic<time_t> LastInput;
 
 queue<frame> FrameBuffer;
 mutex FrameBufferLock;
+condition_variable FrameBufferCondition;
 
 
 //---------------------------------------------------------------------------
@@ -53,6 +53,7 @@ static int ReceiveFrame(unsigned char* Data, int Lenght, int, void *UserData)
     FrameBufferLock.lock();
     FrameBuffer.push(Cur);
     FrameBufferLock.unlock();
+    FrameBufferCondition.notify_all();
 
     return 0;
 }
@@ -405,20 +406,20 @@ void LinuxWrapper::StartCaptureSession()
         ProcessFrameThread = new thread([this]() {
             do
             {
-                FrameBufferLock.lock();
-                if (Wrapper && !FrameBuffer.empty())
+                unique_lock Lock(FrameBufferLock);
+                FrameBufferCondition.wait_for(Lock, chrono::milliseconds(100));
+                while (!FrameBuffer.empty())
                 {
-                    frame Cur = FrameBuffer.back();
+                    frame Cur = FrameBuffer.front();
                     FrameBuffer.pop();
 
-                    Wrapper->Parse_Buffer(Cur.Data, Cur.Size);
+                    if (Wrapper)
+                        Wrapper->Parse_Buffer(Cur.Data, Cur.Size);
                     delete[] Cur.Data;
                 }
-                FrameBufferLock.unlock();
-
-                this_thread::yield();
+                Lock.unlock();
             }
-            while (!Raw1394PoolingThread_Terminate);
+            while (!ProcessFrameThread_Terminate);
         });
     }
 }
@@ -452,7 +453,7 @@ void LinuxWrapper::StopCaptureSession()
     FrameBufferLock.lock();
     while (!FrameBuffer.empty())
     {
-        delete[] FrameBuffer.back().Data;
+        delete[] FrameBuffer.front().Data;
         FrameBuffer.pop();
     }
     FrameBufferLock.unlock();