Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1531825 - Part 1: Prevent already-set DTMF timers from being re-scheduled when new tones are set. Also some simplification. r=mjf

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D33573

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Byron Campen [:bwc] 2019-06-04 15:23:35 +00:00
parent 3f9e04b166
commit c05c24393b
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -1885,7 +1885,6 @@ PeerConnectionImpl::InsertDTMF(TransceiverImpl& transceiver,
state = *mDTMFStates.AppendElement(new DTMFState);
state->mPCObserver = mPCObserver;
state->mTransceiver = &transceiver;
state->mSendTimer = NS_NewTimer();
}
MOZ_ASSERT(state);
@ -1893,7 +1892,7 @@ PeerConnectionImpl::InsertDTMF(TransceiverImpl& transceiver,
state->mDuration = duration;
state->mInterToneGap = interToneGap;
if (!state->mTones.IsEmpty()) {
state->mSendTimer->InitWithCallback(state, 0, nsITimer::TYPE_ONE_SHOT);
state->StartPlayout(0);
}
return NS_OK;
}
@ -1945,7 +1944,7 @@ PeerConnectionImpl::ReplaceTrackNoRenegotiation(TransceiverImpl& aTransceiver,
// TODO(bug 1401983): Move DTMF stuff to TransceiverImpl
for (size_t i = 0; i < mDTMFStates.Length(); ++i) {
if (mDTMFStates[i]->mTransceiver.get() == &aTransceiver) {
mDTMFStates[i]->mSendTimer->Cancel();
mDTMFStates[i]->StopPlayout();
mDTMFStates.RemoveElementAt(i);
break;
}
@ -2179,7 +2178,7 @@ nsresult PeerConnectionImpl::CloseInt() {
// TODO(bug 1401983): Move DTMF stuff to TransceiverImpl
for (auto& dtmfState : mDTMFStates) {
dtmfState->mSendTimer->Cancel();
dtmfState->StopPlayout();
}
// We do this at the end of the call because we want to make sure we've waited
@ -2925,10 +2924,25 @@ void PeerConnectionImpl::startCallTelem() {
Telemetry::Accumulate(Telemetry::WEBRTC_CALL_COUNT_2, 1);
}
void PeerConnectionImpl::DTMFState::StopPlayout() {
if (mSendTimer) {
mSendTimer->Cancel();
mSendTimer = nullptr;
}
}
void PeerConnectionImpl::DTMFState::StartPlayout(uint32_t aDelay) {
if (!mSendTimer) {
mSendTimer = NS_NewTimer();
mSendTimer->InitWithCallback(this, aDelay, nsITimer::TYPE_ONE_SHOT);
}
}
nsresult PeerConnectionImpl::DTMFState::Notify(nsITimer* timer) {
MOZ_ASSERT(NS_IsMainThread());
StopPlayout();
if (!mTransceiver->IsSending()) {
mSendTimer->Cancel();
return NS_OK;
}
@ -2942,16 +2956,12 @@ nsresult PeerConnectionImpl::DTMFState::Notify(nsITimer* timer) {
mTones.Cut(0, 1);
if (tone == -1) {
mSendTimer->InitWithCallback(this, 2000, nsITimer::TYPE_ONE_SHOT);
StartPlayout(2000);
} else {
// Reset delay if necessary
mSendTimer->InitWithCallback(this, mDuration + mInterToneGap,
nsITimer::TYPE_ONE_SHOT);
StartPlayout(mDuration + mInterToneGap);
mTransceiver->InsertDTMFTone(tone, mDuration);
}
} else {
mSendTimer->Cancel();
}
RefPtr<dom::MediaStreamTrack> sendTrack = mTransceiver->GetSendTrack();
@ -2971,7 +2981,7 @@ nsresult PeerConnectionImpl::DTMFState::Notify(nsITimer* timer) {
}
PeerConnectionImpl::DTMFState::DTMFState() = default;
PeerConnectionImpl::DTMFState::~DTMFState() = default;
PeerConnectionImpl::DTMFState::~DTMFState() { StopPlayout(); }
NS_IMPL_ISUPPORTS(PeerConnectionImpl::DTMFState, nsITimerCallback)

3
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
View File

@ -661,6 +661,9 @@ class PeerConnectionImpl final
NS_DECL_NSITIMERCALLBACK
NS_DECL_THREADSAFE_ISUPPORTS
void StopPlayout();
void StartPlayout(uint32_t aDelay);
RefPtr<PeerConnectionObserver> mPCObserver;
RefPtr<TransceiverImpl> mTransceiver;
nsCOMPtr<nsITimer> mSendTimer;