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

Unified Diff: webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.cc

Issue 2672933003: Introduce FecControllerRplrBased (Closed)
Patch Set: Merged 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.cc
deleted file mode 100644
index df9275a6eda1004287e8d9c37c32d20e0a82ed8b..0000000000000000000000000000000000000000
--- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h"
-
-#include <limits>
-#include <utility>
-
-#include "webrtc/base/checks.h"
-
-namespace webrtc {
-
-FecController::Config::Threshold::Threshold(int low_bandwidth_bps,
- float low_bandwidth_packet_loss,
- int high_bandwidth_bps,
- float high_bandwidth_packet_loss)
- : low_bandwidth_bps(low_bandwidth_bps),
- low_bandwidth_packet_loss(low_bandwidth_packet_loss),
- high_bandwidth_bps(high_bandwidth_bps),
- high_bandwidth_packet_loss(high_bandwidth_packet_loss) {}
-
-FecController::Config::Config(bool initial_fec_enabled,
- const Threshold& fec_enabling_threshold,
- const Threshold& fec_disabling_threshold,
- int time_constant_ms,
- const Clock* clock)
- : initial_fec_enabled(initial_fec_enabled),
- fec_enabling_threshold(fec_enabling_threshold),
- fec_disabling_threshold(fec_disabling_threshold),
- time_constant_ms(time_constant_ms),
- clock(clock) {}
-
-FecController::FecController(const Config& config,
- std::unique_ptr<SmoothingFilter> smoothing_filter)
- : config_(config),
- fec_enabled_(config.initial_fec_enabled),
- packet_loss_smoother_(std::move(smoothing_filter)),
- fec_enabling_threshold_info_(config_.fec_enabling_threshold),
- fec_disabling_threshold_info_(config_.fec_disabling_threshold) {
- RTC_DCHECK_LE(fec_enabling_threshold_info_.slope, 0);
- RTC_DCHECK_LE(fec_enabling_threshold_info_.slope, 0);
- RTC_DCHECK_LE(
- GetPacketLossThreshold(config_.fec_enabling_threshold.low_bandwidth_bps,
- config_.fec_disabling_threshold,
- fec_disabling_threshold_info_),
- config_.fec_enabling_threshold.low_bandwidth_packet_loss);
- RTC_DCHECK_LE(
- GetPacketLossThreshold(config_.fec_enabling_threshold.high_bandwidth_bps,
- config_.fec_disabling_threshold,
- fec_disabling_threshold_info_),
- config_.fec_enabling_threshold.high_bandwidth_packet_loss);
-}
-
-FecController::FecController(const Config& config)
- : FecController(
- config,
- std::unique_ptr<SmoothingFilter>(
- new SmoothingFilterImpl(config.time_constant_ms, config.clock))) {
-}
-
-FecController::~FecController() = default;
-
-void FecController::UpdateNetworkMetrics(
- const NetworkMetrics& network_metrics) {
- if (network_metrics.uplink_bandwidth_bps)
- uplink_bandwidth_bps_ = network_metrics.uplink_bandwidth_bps;
- if (network_metrics.uplink_packet_loss_fraction) {
- packet_loss_smoother_->AddSample(
- *network_metrics.uplink_packet_loss_fraction);
- }
-}
-
-void FecController::MakeDecision(
- AudioNetworkAdaptor::EncoderRuntimeConfig* config) {
- RTC_DCHECK(!config->enable_fec);
- RTC_DCHECK(!config->uplink_packet_loss_fraction);
-
- const auto& packet_loss = packet_loss_smoother_->GetAverage();
-
- fec_enabled_ = fec_enabled_ ? !FecDisablingDecision(packet_loss)
- : FecEnablingDecision(packet_loss);
-
- config->enable_fec = rtc::Optional<bool>(fec_enabled_);
-
- config->uplink_packet_loss_fraction =
- rtc::Optional<float>(packet_loss ? *packet_loss : 0.0);
-}
-
-FecController::ThresholdInfo::ThresholdInfo(
- const Config::Threshold& threshold) {
- int bandwidth_diff_bps =
- threshold.high_bandwidth_bps - threshold.low_bandwidth_bps;
- float packet_loss_diff = threshold.high_bandwidth_packet_loss -
- threshold.low_bandwidth_packet_loss;
- slope = bandwidth_diff_bps == 0 ? 0.0 : packet_loss_diff / bandwidth_diff_bps;
- offset =
- threshold.low_bandwidth_packet_loss - slope * threshold.low_bandwidth_bps;
-}
-
-float FecController::GetPacketLossThreshold(
- int bandwidth_bps,
- const Config::Threshold& threshold,
- const ThresholdInfo& threshold_info) const {
- if (bandwidth_bps < threshold.low_bandwidth_bps)
- return std::numeric_limits<float>::max();
- if (bandwidth_bps >= threshold.high_bandwidth_bps)
- return threshold.high_bandwidth_packet_loss;
- return threshold_info.offset + threshold_info.slope * bandwidth_bps;
-}
-
-bool FecController::FecEnablingDecision(
- const rtc::Optional<float>& packet_loss) const {
- if (!uplink_bandwidth_bps_)
- return false;
- if (!packet_loss)
- return false;
- return *packet_loss >= GetPacketLossThreshold(*uplink_bandwidth_bps_,
- config_.fec_enabling_threshold,
- fec_enabling_threshold_info_);
-}
-
-bool FecController::FecDisablingDecision(
- const rtc::Optional<float>& packet_loss) const {
- if (!uplink_bandwidth_bps_)
- return false;
- if (!packet_loss)
- return false;
- return *packet_loss <= GetPacketLossThreshold(*uplink_bandwidth_bps_,
- config_.fec_disabling_threshold,
- fec_disabling_threshold_info_);
-}
-
-} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698