StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

partial fix for #426

Browse Source
This commit is contained in:
krepa098 2014-10-11 21:07:26 +02:00
parent 1d4055858f
commit 122e13ff98
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cameraworker.cpp
View File

@ -124,6 +124,7 @@ void CameraWorker::subscribe()
{ {
if (!cam.isOpened()) if (!cam.isOpened())
{ {
queue.clear();
cam.open(camIndex); cam.open(camIndex);
applyProps(); // restore props applyProps(); // restore props
} }
@ -148,15 +149,16 @@ void CameraWorker::doWork()
return; return;
if (queue.size() > 3) if (queue.size() > 3)
return;
if (!cam.read(frame))
{ {
queue.dequeue(); cam.release();
qDebug() << "CameraWorker: received empty frame -> closing";
return; return;
} }
cam >> frame;
//qDebug() << "Decoding frame";
mutex.lock(); mutex.lock();
queue.enqueue(frame); queue.enqueue(frame);
mutex.unlock(); mutex.unlock();
@ -174,6 +176,9 @@ bool CameraWorker::hasFrame()
cv::Mat3b CameraWorker::dequeueFrame() cv::Mat3b CameraWorker::dequeueFrame()
{ {
if (queue.isEmpty())
return cv::Mat3b();
mutex.lock(); mutex.lock();
cv::Mat3b f = queue.dequeue(); cv::Mat3b f = queue.dequeue();
mutex.unlock(); mutex.unlock();