| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 2354 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2365     return 0; | 2365     return 0; | 
| 2366 } | 2366 } | 
| 2367 | 2367 | 
| 2368 int Channel::SendTelephoneEventOutband(unsigned char eventCode, | 2368 int Channel::SendTelephoneEventOutband(unsigned char eventCode, | 
| 2369                                        int lengthMs, int attenuationDb, | 2369                                        int lengthMs, int attenuationDb, | 
| 2370                                        bool playDtmfEvent) | 2370                                        bool playDtmfEvent) | 
| 2371 { | 2371 { | 
| 2372     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), | 2372     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), | 
| 2373                "Channel::SendTelephoneEventOutband(..., playDtmfEvent=%d)", | 2373                "Channel::SendTelephoneEventOutband(..., playDtmfEvent=%d)", | 
| 2374                playDtmfEvent); | 2374                playDtmfEvent); | 
|  | 2375     if (!Sending()) { | 
|  | 2376       return -1; | 
|  | 2377     } | 
| 2375 | 2378 | 
| 2376     _playOutbandDtmfEvent = playDtmfEvent; | 2379     _playOutbandDtmfEvent = playDtmfEvent; | 
| 2377 | 2380 | 
| 2378     if (_rtpRtcpModule->SendTelephoneEventOutband(eventCode, lengthMs, | 2381     if (_rtpRtcpModule->SendTelephoneEventOutband(eventCode, lengthMs, | 
| 2379                                                  attenuationDb) != 0) | 2382                                                  attenuationDb) != 0) | 
| 2380     { | 2383     { | 
| 2381         _engineStatisticsPtr->SetLastError( | 2384         _engineStatisticsPtr->SetLastError( | 
| 2382             VE_SEND_DTMF_FAILED, | 2385             VE_SEND_DTMF_FAILED, | 
| 2383             kTraceWarning, | 2386             kTraceWarning, | 
| 2384             "SendTelephoneEventOutband() failed to send event"); | 2387             "SendTelephoneEventOutband() failed to send event"); | 
| (...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3942   int64_t min_rtt = 0; | 3945   int64_t min_rtt = 0; | 
| 3943   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) | 3946   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) | 
| 3944       != 0) { | 3947       != 0) { | 
| 3945     return 0; | 3948     return 0; | 
| 3946   } | 3949   } | 
| 3947   return rtt; | 3950   return rtt; | 
| 3948 } | 3951 } | 
| 3949 | 3952 | 
| 3950 }  // namespace voe | 3953 }  // namespace voe | 
| 3951 }  // namespace webrtc | 3954 }  // namespace webrtc | 
| OLD | NEW | 
|---|