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

fix(video): unsubscribe the video device correctly

Browse Source 
fixes #5110
This commit is contained in:
sudden6 2018-05-05 13:45:17 +02:00
parent 50cee67f5f
commit e55f86c6a5
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/toxcall.cpp
View File

@ -64,16 +64,20 @@ ToxCall::ToxCall(uint32_t CallId, bool VideoEnabled, CoreAV& av)
}
}
ToxCall::ToxCall(ToxCall&& other) noexcept : audioInConn{other.audioInConn},
alSource{other.alSource},
active{other.active},
/**
* @brief ToxCall move constructor
* @param other object moved from
*/
ToxCall::ToxCall(ToxCall&& other) noexcept : active{other.active},
av{other.av},
audioInConn{other.audioInConn},
muteMic{other.muteMic},
muteVol{other.muteVol},
alSource{other.alSource},
videoSource{other.videoSource},
videoInConn{other.videoInConn},
videoEnabled{other.videoEnabled},
nullVideoBitrate{other.nullVideoBitrate},
videoSource{other.videoSource},
av{other.av}
nullVideoBitrate{other.nullVideoBitrate}
{
Audio& audio = Audio::getInstance();
audio.subscribeInput();
@ -95,20 +99,14 @@ ToxCall::~ToxCall()
if (videoEnabled) {
QObject::disconnect(videoInConn);
CameraSource::getInstance().unsubscribe();
// TODO: check if async is still needed
// This destructor could be running in a toxav callback while holding toxav locks.
// If the CameraSource thread calls toxav *_send_frame, we might deadlock the toxav and
// CameraSource locks,
// so we unsuscribe asynchronously, it's fine if the webcam takes a couple milliseconds more
// to poweroff.
QtConcurrent::run([]() { CameraSource::getInstance().unsubscribe(); });
if (videoSource) {
videoSource->setDeleteOnClose(true);
videoSource = nullptr;
}
}
}
/**
* @brief ToxCall move assignement
* @param other object moved from
* @return object moved to
*/
ToxCall& ToxCall::operator=(ToxCall&& other) noexcept
{
QObject::disconnect(audioInConn);