| 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 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1525 } | 1525 } |
| 1526 }); | 1526 }); |
| 1527 return success; | 1527 return success; |
| 1528 } | 1528 } |
| 1529 | 1529 |
| 1530 bool Channel::EnableAudioNetworkAdaptor(const std::string& config_string) { | 1530 bool Channel::EnableAudioNetworkAdaptor(const std::string& config_string) { |
| 1531 bool success = false; | 1531 bool success = false; |
| 1532 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) { | 1532 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) { |
| 1533 if (*encoder) { | 1533 if (*encoder) { |
| 1534 success = (*encoder)->EnableAudioNetworkAdaptor( | 1534 success = (*encoder)->EnableAudioNetworkAdaptor( |
| 1535 config_string, Clock::GetRealTimeClock()); | 1535 config_string, event_log_proxy_.get(), Clock::GetRealTimeClock()); |
| 1536 } | 1536 } |
| 1537 }); | 1537 }); |
| 1538 return success; | 1538 return success; |
| 1539 } | 1539 } |
| 1540 | 1540 |
| 1541 void Channel::DisableAudioNetworkAdaptor() { | 1541 void Channel::DisableAudioNetworkAdaptor() { |
| 1542 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) { | 1542 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) { |
| 1543 if (*encoder) | 1543 if (*encoder) |
| 1544 (*encoder)->DisableAudioNetworkAdaptor(); | 1544 (*encoder)->DisableAudioNetworkAdaptor(); |
| 1545 }); | 1545 }); |
| (...skipping 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3277 int64_t min_rtt = 0; | 3277 int64_t min_rtt = 0; |
| 3278 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3278 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
| 3279 0) { | 3279 0) { |
| 3280 return 0; | 3280 return 0; |
| 3281 } | 3281 } |
| 3282 return rtt; | 3282 return rtt; |
| 3283 } | 3283 } |
| 3284 | 3284 |
| 3285 } // namespace voe | 3285 } // namespace voe |
| 3286 } // namespace webrtc | 3286 } // namespace webrtc |
| OLD | NEW |