Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1202)

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 2782563003: Replace Clock with timeutils in AudioEncoder. (Closed)
Patch Set: Fix for failing unittest. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 success = 0; 1604 success = 0;
1605 } 1605 }
1606 }); 1606 });
1607 return success; 1607 return success;
1608 } 1608 }
1609 1609
1610 bool Channel::EnableAudioNetworkAdaptor(const std::string& config_string) { 1610 bool Channel::EnableAudioNetworkAdaptor(const std::string& config_string) {
1611 bool success = false; 1611 bool success = false;
1612 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) { 1612 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
1613 if (*encoder) { 1613 if (*encoder) {
1614 success = (*encoder)->EnableAudioNetworkAdaptor( 1614 success = (*encoder)->EnableAudioNetworkAdaptor(config_string,
1615 config_string, event_log_proxy_.get(), Clock::GetRealTimeClock()); 1615 event_log_proxy_.get());
1616 } 1616 }
1617 }); 1617 });
1618 return success; 1618 return success;
1619 } 1619 }
1620 1620
1621 void Channel::DisableAudioNetworkAdaptor() { 1621 void Channel::DisableAudioNetworkAdaptor() {
1622 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) { 1622 audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
1623 if (*encoder) 1623 if (*encoder)
1624 (*encoder)->DisableAudioNetworkAdaptor(); 1624 (*encoder)->DisableAudioNetworkAdaptor();
1625 }); 1625 });
(...skipping 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after
3108 int64_t min_rtt = 0; 3108 int64_t min_rtt = 0;
3109 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3109 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3110 0) { 3110 0) {
3111 return 0; 3111 return 0;
3112 } 3112 }
3113 return rtt; 3113 return rtt;
3114 } 3114 }
3115 3115
3116 } // namespace voe 3116 } // namespace voe
3117 } // namespace webrtc 3117 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698