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

perf: Optimize open/close device

Browse Source 
Because while device thread wait for a freeing 'streamMutex', in another
thread someone can subscribe or unsubscribe => it will require useless
pair (close + open) or (open + close)
This commit is contained in:
Diadlo 2017-06-27 00:32:27 +03:00
parent d86912eacd
commit d704f5d21d
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/camerasource.cpp
View File

@ -168,15 +168,21 @@ void CameraSource::setupDevice(const QString& DeviceName, const VideoMode& Mode)
return; return;
} }
if (subscriptions) if (subscriptions) {
// To force close, ignoring optimization
int subs = subscriptions;
subscriptions = 0;
closeDevice(); closeDevice();
subscriptions = subs;
}
deviceName = DeviceName; deviceName = DeviceName;
mode = Mode; mode = Mode;
_isNone = (deviceName == "none"); _isNone = (deviceName == "none");
if (subscriptions && !_isNone) if (subscriptions && !_isNone) {
openDevice(); openDevice();
}
} }
bool CameraSource::isNone() const bool CameraSource::isNone() const
@ -253,6 +259,10 @@ void CameraSource::openDevice()
} }
QWriteLocker locker{&streamMutex}; QWriteLocker locker{&streamMutex};
if (subscriptions == 0) {
return;
}
qDebug() << "Opening device " << deviceName; qDebug() << "Opening device " << deviceName;
if (device) { if (device) {
@ -365,6 +375,10 @@ void CameraSource::closeDevice()
} }
QWriteLocker locker{&streamMutex}; QWriteLocker locker{&streamMutex};
if (subscriptions != 0) {
return;
}
qDebug() << "Closing device " << deviceName; qDebug() << "Closing device " << deviceName;
// Free all remaining VideoFrame // Free all remaining VideoFrame