| 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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 "Channel::Init() must call SetEngineInformation() first"); | 924 "Channel::Init() must call SetEngineInformation() first"); |
| 925 return -1; | 925 return -1; |
| 926 } | 926 } |
| 927 | 927 |
| 928 // --- Add modules to process thread (for periodic schedulation) | 928 // --- Add modules to process thread (for periodic schedulation) |
| 929 | 929 |
| 930 _moduleProcessThreadPtr->RegisterModule(_rtpRtcpModule.get()); | 930 _moduleProcessThreadPtr->RegisterModule(_rtpRtcpModule.get()); |
| 931 | 931 |
| 932 // --- ACM initialization | 932 // --- ACM initialization |
| 933 | 933 |
| 934 if ((audio_coding_->InitializeReceiver() == -1) | 934 if (audio_coding_->InitializeReceiver() == -1) { |
| 935 // out-of-band Dtmf tones are played out by default | |
| 936 || (audio_coding_->SetDtmfPlayoutStatus(true) == -1)) { | |
| 937 _engineStatisticsPtr->SetLastError( | 935 _engineStatisticsPtr->SetLastError( |
| 938 VE_AUDIO_CODING_MODULE_ERROR, kTraceError, | 936 VE_AUDIO_CODING_MODULE_ERROR, kTraceError, |
| 939 "Channel::Init() unable to initialize the ACM - 1"); | 937 "Channel::Init() unable to initialize the ACM - 1"); |
| 940 return -1; | 938 return -1; |
| 941 } | 939 } |
| 942 | 940 |
| 943 // --- RTP/RTCP module initialization | 941 // --- RTP/RTCP module initialization |
| 944 | 942 |
| 945 // Ensure that RTCP is enabled by default for the created channel. | 943 // Ensure that RTCP is enabled by default for the created channel. |
| 946 // Note that, the module will keep generating RTCP until it is explicitly | 944 // Note that, the module will keep generating RTCP until it is explicitly |
| (...skipping 3201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4148 int64_t min_rtt = 0; | 4146 int64_t min_rtt = 0; |
| 4149 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) | 4147 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) |
| 4150 != 0) { | 4148 != 0) { |
| 4151 return 0; | 4149 return 0; |
| 4152 } | 4150 } |
| 4153 return rtt; | 4151 return rtt; |
| 4154 } | 4152 } |
| 4155 | 4153 |
| 4156 } // namespace voe | 4154 } // namespace voe |
| 4157 } // namespace webrtc | 4155 } // namespace webrtc |
| OLD | NEW |