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

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

Issue 2643133003: Instantly pass network changes to controllers in audio network adaptor. (Closed)
Patch Set: fixing unittests Created 3 years, 10 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
11 #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" 11 #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h"
12 #include "webrtc/base/checks.h" 12 #include "webrtc/base/checks.h"
13 13
14 namespace webrtc { 14 namespace webrtc {
15 15
16 DtxController::Config::Config(bool initial_dtx_enabled, 16 DtxController::Config::Config(bool initial_dtx_enabled,
17 int dtx_enabling_bandwidth_bps, 17 int dtx_enabling_bandwidth_bps,
18 int dtx_disabling_bandwidth_bps) 18 int dtx_disabling_bandwidth_bps)
19 : initial_dtx_enabled(initial_dtx_enabled), 19 : initial_dtx_enabled(initial_dtx_enabled),
20 dtx_enabling_bandwidth_bps(dtx_enabling_bandwidth_bps), 20 dtx_enabling_bandwidth_bps(dtx_enabling_bandwidth_bps),
21 dtx_disabling_bandwidth_bps(dtx_disabling_bandwidth_bps) {} 21 dtx_disabling_bandwidth_bps(dtx_disabling_bandwidth_bps) {}
22 22
23 DtxController::DtxController(const Config& config) 23 DtxController::DtxController(const Config& config)
24 : config_(config), dtx_enabled_(config_.initial_dtx_enabled) {} 24 : config_(config), dtx_enabled_(config_.initial_dtx_enabled) {}
25 25
26 DtxController::~DtxController() = default;
27
28 void DtxController::UpdateNetworkMetrics(
29 const NetworkMetrics& network_metrics) {
30 if (network_metrics.uplink_bandwidth_bps)
31 uplink_bandwidth_bps_ = network_metrics.uplink_bandwidth_bps;
32 }
33
26 void DtxController::MakeDecision( 34 void DtxController::MakeDecision(
27 const NetworkMetrics& metrics,
28 AudioNetworkAdaptor::EncoderRuntimeConfig* config) { 35 AudioNetworkAdaptor::EncoderRuntimeConfig* config) {
29 // Decision on |enable_dtx| should not have been made. 36 // Decision on |enable_dtx| should not have been made.
30 RTC_DCHECK(!config->enable_dtx); 37 RTC_DCHECK(!config->enable_dtx);
31 38
32 if (metrics.uplink_bandwidth_bps) { 39 if (uplink_bandwidth_bps_) {
33 if (dtx_enabled_ && 40 if (dtx_enabled_ &&
34 *metrics.uplink_bandwidth_bps >= config_.dtx_disabling_bandwidth_bps) { 41 *uplink_bandwidth_bps_ >= config_.dtx_disabling_bandwidth_bps) {
35 dtx_enabled_ = false; 42 dtx_enabled_ = false;
36 } else if (!dtx_enabled_ && 43 } else if (!dtx_enabled_ &&
37 *metrics.uplink_bandwidth_bps <= 44 *uplink_bandwidth_bps_ <= config_.dtx_enabling_bandwidth_bps) {
38 config_.dtx_enabling_bandwidth_bps) {
39 dtx_enabled_ = true; 45 dtx_enabled_ = true;
40 } 46 }
41 } 47 }
42 config->enable_dtx = rtc::Optional<bool>(dtx_enabled_); 48 config->enable_dtx = rtc::Optional<bool>(dtx_enabled_);
43 } 49 }
44 50
45 } // namespace webrtc 51 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698