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

Merge pull request #4784

Browse Source 
anthony.bilinski (1):
      fix(call): fix bugs introduced from ToxCall refactor
This commit is contained in:
sudden6 2017-11-03 13:38:39 +01:00
commit 39047f2ebd
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/coreav.cpp
View File

@ -240,7 +240,7 @@ bool CoreAV::answerCall(uint32_t friendNum, bool video)
const uint32_t videoBitrate = video ? VIDEO_DEFAULT_BITRATE : 0; const uint32_t videoBitrate = video ? VIDEO_DEFAULT_BITRATE : 0;
if (toxav_answer(toxav, friendNum, Settings::getInstance().getAudioBitrate(), videoBitrate, &err)) { if (toxav_answer(toxav, friendNum, Settings::getInstance().getAudioBitrate(), videoBitrate, &err)) {
calls[friendNum].setActive(false); calls[friendNum].setActive(true);
return true; return true;
} else { } else {
qWarning() << "Failed to answer call with error" << err; qWarning() << "Failed to answer call with error" << err;
@ -344,7 +344,7 @@ bool CoreAV::sendCallAudio(uint32_t callId, const int16_t* pcm, size_t samples,
ToxFriendCall& call = calls[callId]; ToxFriendCall& call = calls[callId];
if (call.getMuteMic() || call.isActive() if (call.getMuteMic() || !call.isActive()
|| !(call.getState() & TOXAV_FRIEND_CALL_STATE_ACCEPTING_A)) { || !(call.getState() & TOXAV_FRIEND_CALL_STATE_ACCEPTING_A)) {
return true; return true;
} }
@ -379,15 +379,15 @@ void CoreAV::sendCallVideo(uint32_t callId, std::shared_ptr<VideoFrame> vframe)
ToxFriendCall& call = calls[callId]; ToxFriendCall& call = calls[callId];
if (!call.getVideoEnabled() || call.isActive() if (!call.getVideoEnabled() || !call.isActive()
|| !(call.getState() & TOXAV_FRIEND_CALL_STATE_ACCEPTING_V)) { || !(call.getState() & TOXAV_FRIEND_CALL_STATE_ACCEPTING_V)) {
return; return;
} }
if (call.getVideoEnabled()) { if (call.getNullVideoBitrate()) {
qDebug() << "Restarting video stream to friend" << callId; qDebug() << "Restarting video stream to friend" << callId;
toxav_bit_rate_set(toxav, callId, -1, VIDEO_DEFAULT_BITRATE, nullptr); toxav_bit_rate_set(toxav, callId, -1, VIDEO_DEFAULT_BITRATE, nullptr);
call.setVideoEnabled(false); call.setNullVideoBitrate(false);
} }
ToxYUVFrame frame = vframe->toToxYUVFrame(); ToxYUVFrame frame = vframe->toToxYUVFrame();
@ -436,7 +436,7 @@ void CoreAV::toggleMuteCallOutput(const Friend* f)
{ {
if (f && (calls.find(f->getId()) != calls.end())) { if (f && (calls.find(f->getId()) != calls.end())) {
ToxCall& call = calls[f->getId()]; ToxCall& call = calls[f->getId()];
call.setMuteVol(call.getMuteVol()); call.setMuteVol(!call.getMuteVol());
} }
} }
@ -473,8 +473,10 @@ void CoreAV::groupCallCallback(void* tox, int group, int peer, const int16_t* da
} }
Audio& audio = Audio::getInstance(); Audio& audio = Audio::getInstance();
if (!call.getPeers()[peer]) if (!call.getPeers()[peer]) {
// FIXME: 0 is a valid sourceId, we shouldn't necessarily re-subscribe just because we have 0
audio.subscribeOutput(call.getPeers()[peer]); audio.subscribeOutput(call.getPeers()[peer]);
}
audio.playAudioBuffer(call.getPeers()[peer], data, samples, channels, sample_rate); audio.playAudioBuffer(call.getPeers()[peer], data, samples, channels, sample_rate);
} }
@ -517,7 +519,7 @@ void CoreAV::joinGroupCall(int groupId)
qDebug() << QString("Joining group call %1").arg(groupId); qDebug() << QString("Joining group call %1").arg(groupId);
groupCalls[groupId] = ToxGroupCall{groupId, *this}; groupCalls[groupId] = ToxGroupCall{groupId, *this};
groupCalls[groupId].setActive(false); groupCalls[groupId].setActive(true);
} }
/** /**
@ -541,7 +543,7 @@ bool CoreAV::sendGroupCallAudio(int groupId, const int16_t* pcm, size_t samples,
ToxGroupCall& call = groupCalls[groupId]; ToxGroupCall& call = groupCalls[groupId];
if (call.isActive() || call.getMuteMic()) { if (!call.isActive() || call.getMuteMic()) {
return true; return true;
} }
@ -772,7 +774,7 @@ void CoreAV::stateCallback(ToxAV* toxav, uint32_t friendNum, uint32_t state, voi
// If our state was null, we started the call and were still ringing // If our state was null, we started the call and were still ringing
if (!call.getState() && state) { if (!call.getState() && state) {
call.stopTimeout(); call.stopTimeout();
call.setActive(false); call.setActive(true);
emit self->avStart(friendNum, call.getVideoEnabled()); emit self->avStart(friendNum, call.getVideoEnabled());
} else if ((call.getState() & TOXAV_FRIEND_CALL_STATE_SENDING_V) } else if ((call.getState() & TOXAV_FRIEND_CALL_STATE_SENDING_V)
&& !(state & TOXAV_FRIEND_CALL_STATE_SENDING_V)) { && !(state & TOXAV_FRIEND_CALL_STATE_SENDING_V)) {

9
src/core/toxcall.cpp
View File

@ -63,6 +63,13 @@ ToxCall::~ToxCall()
ToxCall& ToxCall::operator=(ToxCall&& other) noexcept ToxCall& ToxCall::operator=(ToxCall&& other) noexcept
{ {
if (valid) {
// if we're already valid, we need to cleanup our resources since we're going to inherit the resources
// that are being moved in
QObject::disconnect(audioInConn);
Audio::getInstance().unsubscribeInput();
}
audioInConn = other.audioInConn; audioInConn = other.audioInConn;
other.audioInConn = QMetaObject::Connection(); other.audioInConn = QMetaObject::Connection();
active = other.active; active = other.active;
@ -312,7 +319,7 @@ void ToxGroupCall::removePeer(int peerId)
peers.remove(peerId); peers.remove(peerId);
} }
QMap<int, quint32> ToxGroupCall::getPeers() const QMap<int, quint32>& ToxGroupCall::getPeers()
{ {
return peers; return peers;
} }

2
src/core/toxcall.h
View File

@ -98,7 +98,7 @@ public:
void removePeer(int peerId); void removePeer(int peerId);
QMap<int, quint32> getPeers() const; QMap<int, quint32>& getPeers();
private: private:
QMap<int, quint32> peers; QMap<int, quint32> peers;