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

Side by Side Diff: webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc

Issue 2745473003: Resolve cyclic dependency between audio network adaptor and event log api (Closed)
Patch Set: Revert "Activated checks for rtc_event_log_api" 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 13 matching lines...) Expand all
24 : config_(config), dtx_enabled_(config_.initial_dtx_enabled) {} 24 : config_(config), dtx_enabled_(config_.initial_dtx_enabled) {}
25 25
26 DtxController::~DtxController() = default; 26 DtxController::~DtxController() = default;
27 27
28 void DtxController::UpdateNetworkMetrics( 28 void DtxController::UpdateNetworkMetrics(
29 const NetworkMetrics& network_metrics) { 29 const NetworkMetrics& network_metrics) {
30 if (network_metrics.uplink_bandwidth_bps) 30 if (network_metrics.uplink_bandwidth_bps)
31 uplink_bandwidth_bps_ = network_metrics.uplink_bandwidth_bps; 31 uplink_bandwidth_bps_ = network_metrics.uplink_bandwidth_bps;
32 } 32 }
33 33
34 void DtxController::MakeDecision( 34 void DtxController::MakeDecision(AudioEncoderRuntimeConfig* config) {
35 AudioNetworkAdaptor::EncoderRuntimeConfig* config) {
36 // Decision on |enable_dtx| should not have been made. 35 // Decision on |enable_dtx| should not have been made.
37 RTC_DCHECK(!config->enable_dtx); 36 RTC_DCHECK(!config->enable_dtx);
38 37
39 if (uplink_bandwidth_bps_) { 38 if (uplink_bandwidth_bps_) {
40 if (dtx_enabled_ && 39 if (dtx_enabled_ &&
41 *uplink_bandwidth_bps_ >= config_.dtx_disabling_bandwidth_bps) { 40 *uplink_bandwidth_bps_ >= config_.dtx_disabling_bandwidth_bps) {
42 dtx_enabled_ = false; 41 dtx_enabled_ = false;
43 } else if (!dtx_enabled_ && 42 } else if (!dtx_enabled_ &&
44 *uplink_bandwidth_bps_ <= config_.dtx_enabling_bandwidth_bps) { 43 *uplink_bandwidth_bps_ <= config_.dtx_enabling_bandwidth_bps) {
45 dtx_enabled_ = true; 44 dtx_enabled_ = true;
46 } 45 }
47 } 46 }
48 config->enable_dtx = rtc::Optional<bool>(dtx_enabled_); 47 config->enable_dtx = rtc::Optional<bool>(dtx_enabled_);
49 } 48 }
50 49
51 } // namespace webrtc 50 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698