commit 74158ff76177f1982d7f6930d73384e243997092
author Jakob Ivarsson <jakobi@webrtc.org> Tue Sep 07 14:24:56 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 07 13:45:47 2021 +0000
tree fdd2cabd076120841b130e7c97e124e78496dd71
parent 0dfd69bf4e8c95336cedb1f11560fca34d625214

Refactor delay manager.

Split out `RelativeArrivalDelayTracker` and `DelayOptimizer` logic.

This is in preparation for adding another `DelayOptimizer` specialized in handling reordered packets.

Bug: webrtc:10178
Change-Id: Id3c1746d91980b171fa524f9b2b71cf11fc75f64
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231224
Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34938}

modules/audio_coding/neteq/decision_logic.cc

diff --git a/modules/audio_coding/neteq/decision_logic.cc b/modules/audio_coding/neteq/decision_logic.cc
index ceefe50..30463fc 100644
--- a/modules/audio_coding/neteq/decision_logic.cc
+++ b/modules/audio_coding/neteq/decision_logic.cc
@@ -22,21 +22,28 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/field_trial.h"
 
+namespace webrtc {
+
 namespace {
 
 constexpr int kPostponeDecodingLevel = 50;
 constexpr int kDefaultTargetLevelWindowMs = 100;
 constexpr int kDecelerationTargetLevelOffsetMs = 85;
 
-}  // namespace
+std::unique_ptr<DelayManager> CreateDelayManager(
+    const NetEqController::Config& neteq_config) {
+  DelayManager::Config config;
+  config.max_packets_in_buffer = neteq_config.max_packets_in_buffer;
+  config.base_minimum_delay_ms = neteq_config.base_min_delay_ms;
+  config.Log();
+  return std::make_unique<DelayManager>(config, neteq_config.tick_timer);
+}
 
-namespace webrtc {
+}  // namespace
 
 DecisionLogic::DecisionLogic(NetEqController::Config config)
     : DecisionLogic(config,
-                    DelayManager::Create(config.max_packets_in_buffer,
-                                         config.base_min_delay_ms,
-                                         config.tick_timer),
+                    CreateDelayManager(config),
                     std::make_unique<BufferLevelFilter>()) {}
 
 DecisionLogic::DecisionLogic(