diff options
| author | Fredrik Solenberg <solenberg@webrtc.org> | 2015-12-04 15:22:19 +0100 |
|---|---|---|
| committer | Fredrik Solenberg <solenberg@webrtc.org> | 2015-12-04 14:22:30 +0000 |
| commit | b572768efbc1e52b97a5ad98932c667956aba4b8 (patch) | |
| tree | 64ff145b6a47859a8860218c2748196cc32075a0 /webrtc/voice_engine/channel.cc | |
| parent | fcdcf4a92796bd915f0abb343f99f79256ec7d38 (diff) | |
| download | webrtc-b572768efbc1e52b97a5ad98932c667956aba4b8.tar.gz | |
- Remove calls to VoEDtmf from WVoE/MC.
- Flatten logic and make the relevant calls on VoE::Channel from AudioSendStream::SendTelephoneEvent().
- Store current payload type for telephone events in WVoMC, instead of setting it on the Channel. This should be refactored to be an AudioSendStream::Config parameter when we redo WVoMC::SetSendCodecs().
BUG=webrtc:4690
R=pthatcher@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1491743004 .
Cr-Commit-Position: refs/heads/master@{#10895}
Diffstat (limited to 'webrtc/voice_engine/channel.cc')
| -rw-r--r-- | webrtc/voice_engine/channel.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 54aa802d73..fb9835664a 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -2372,6 +2372,9 @@ int Channel::SendTelephoneEventOutband(unsigned char eventCode, WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), "Channel::SendTelephoneEventOutband(..., playDtmfEvent=%d)", playDtmfEvent); + if (!Sending()) { + return -1; + } _playOutbandDtmfEvent = playDtmfEvent; |