commit 53a31f7db8045acc59d43ae31880444ee9a13366
author Ivo Creusen <ivoc@webrtc.org> Thu Oct 24 15:20:39 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Oct 25 11:36:41 2019 +0000
tree 2f0f9004e0a334263e5355ef7db18634ce9a7cc9
parent 16cec3be2c96d7db74e5cb6a9d9837e98d09944e

Introduce injectable NetEqController interface.

This interface is implemented by the DecisionLogic class, which now contains the DelayManager and DelayPeakDetector.

Bug: webrtc:11005
Change-Id: I4fb69fa359e60831cf153e41f101d5b623749380
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/155176
Reviewed-by: Minyue Li <minyue@webrtc.org>
Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29613}

modules/audio_coding/neteq/decision_logic_unittest.cc

diff --git a/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc
index 82f86c0..9ba3b9d 100644
--- a/modules/audio_coding/neteq/decision_logic_unittest.cc
+++ b/modules/audio_coding/neteq/decision_logic_unittest.cc
@@ -16,6 +16,7 @@
 #include "modules/audio_coding/neteq/decoder_database.h"
 #include "modules/audio_coding/neteq/delay_manager.h"
 #include "modules/audio_coding/neteq/delay_peak_detector.h"
+#include "modules/audio_coding/neteq/neteq_controller.h"
 #include "modules/audio_coding/neteq/packet_buffer.h"
 #include "modules/audio_coding/neteq/statistics_calculator.h"
 #include "modules/audio_coding/neteq/tick_timer.h"
@@ -32,14 +33,15 @@
   TickTimer tick_timer;
   StatisticsCalculator stats;
   PacketBuffer packet_buffer(10, &tick_timer);
-  DelayPeakDetector delay_peak_detector(&tick_timer, false);
-  auto delay_manager = DelayManager::Create(240, 0, false, &delay_peak_detector,
-                                            &tick_timer, &stats);
   BufferLevelFilter buffer_level_filter;
-  DecisionLogic* logic = DecisionLogic::Create(
-      fs_hz, output_size_samples, false, &decoder_database, packet_buffer,
-      delay_manager.get(), &buffer_level_filter, &tick_timer);
-  delete logic;
+  NetEqController::Config config;
+  config.tick_timer = &tick_timer;
+  config.base_min_delay_ms = 0;
+  config.max_packets_in_buffer = 240;
+  config.enable_rtx_handling = false;
+  config.allow_time_stretching = true;
+  auto logic = std::make_unique<DecisionLogic>(std::move(config));
+  logic->SetSampleRate(fs_hz, output_size_samples);
 }
 
 // TODO(hlundin): Write more tests.