| 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 3109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3120 } | 3120 } |
| 3121 return 0; | 3121 return 0; |
| 3122 } | 3122 } |
| 3123 | 3123 |
| 3124 int | 3124 int |
| 3125 Channel::GetREDStatus(bool& enabled, int& redPayloadtype) | 3125 Channel::GetREDStatus(bool& enabled, int& redPayloadtype) |
| 3126 { | 3126 { |
| 3127 enabled = audio_coding_->REDStatus(); | 3127 enabled = audio_coding_->REDStatus(); |
| 3128 if (enabled) | 3128 if (enabled) |
| 3129 { | 3129 { |
| 3130 int8_t payloadType(0); | 3130 int8_t payloadType = 0; |
| 3131 if (_rtpRtcpModule->SendREDPayloadType(payloadType) != 0) | 3131 if (_rtpRtcpModule->SendREDPayloadType(&payloadType) != 0) { |
| 3132 { | |
| 3133 _engineStatisticsPtr->SetLastError( | 3132 _engineStatisticsPtr->SetLastError( |
| 3134 VE_RTP_RTCP_MODULE_ERROR, kTraceError, | 3133 VE_RTP_RTCP_MODULE_ERROR, kTraceError, |
| 3135 "GetREDStatus() failed to retrieve RED PT from RTP/RTCP " | 3134 "GetREDStatus() failed to retrieve RED PT from RTP/RTCP " |
| 3136 "module"); | 3135 "module"); |
| 3137 return -1; | 3136 return -1; |
| 3138 } | 3137 } |
| 3139 redPayloadtype = payloadType; | 3138 redPayloadtype = payloadType; |
| 3140 return 0; | 3139 return 0; |
| 3141 } | 3140 } |
| 3142 return 0; | 3141 return 0; |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3942 int64_t min_rtt = 0; | 3941 int64_t min_rtt = 0; |
| 3943 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) | 3942 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) |
| 3944 != 0) { | 3943 != 0) { |
| 3945 return 0; | 3944 return 0; |
| 3946 } | 3945 } |
| 3947 return rtt; | 3946 return rtt; |
| 3948 } | 3947 } |
| 3949 | 3948 |
| 3950 } // namespace voe | 3949 } // namespace voe |
| 3951 } // namespace webrtc | 3950 } // namespace webrtc |
| OLD | NEW |