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

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

Issue 2745473003: Resolve cyclic dependency between audio network adaptor and event log api (Closed)
Patch Set: Created 3 years, 9 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
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 void LogDelayBasedBweUpdate(int32_t bitrate_bps, 154 void LogDelayBasedBweUpdate(int32_t bitrate_bps,
155 BandwidthUsage detector_state) override { 155 BandwidthUsage detector_state) override {
156 rtc::CritScope lock(&crit_); 156 rtc::CritScope lock(&crit_);
157 if (event_log_) { 157 if (event_log_) {
158 event_log_->LogDelayBasedBweUpdate(bitrate_bps, detector_state); 158 event_log_->LogDelayBasedBweUpdate(bitrate_bps, detector_state);
159 } 159 }
160 } 160 }
161 161
162 void LogAudioNetworkAdaptation( 162 void LogAudioNetworkAdaptation(
163 const AudioNetworkAdaptor::EncoderRuntimeConfig& config) override { 163 const AudioEncoderRuntimeConfig& config) override {
164 rtc::CritScope lock(&crit_); 164 rtc::CritScope lock(&crit_);
165 if (event_log_) { 165 if (event_log_) {
166 event_log_->LogAudioNetworkAdaptation(config); 166 event_log_->LogAudioNetworkAdaptation(config);
167 } 167 }
168 } 168 }
169 169
170 void LogProbeClusterCreated(int id, 170 void LogProbeClusterCreated(int id,
171 int bitrate_bps, 171 int bitrate_bps,
172 int min_probes, 172 int min_probes,
173 int min_bytes) override { 173 int min_bytes) override {
(...skipping 2836 matching lines...) Expand 10 before | Expand all | Expand 10 after
3010 int64_t min_rtt = 0; 3010 int64_t min_rtt = 0;
3011 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3011 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3012 0) { 3012 0) {
3013 return 0; 3013 return 0;
3014 } 3014 }
3015 return rtt; 3015 return rtt;
3016 } 3016 }
3017 3017
3018 } // namespace voe 3018 } // namespace voe
3019 } // namespace webrtc 3019 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698