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/delay_manager.cc

diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc
index 3fda038..727c522 100644
--- a/modules/audio_coding/neteq/delay_manager.cc
+++ b/modules/audio_coding/neteq/delay_manager.cc
@@ -21,7 +21,6 @@
 
 #include "modules/audio_coding/neteq/delay_peak_detector.h"
 #include "modules/audio_coding/neteq/histogram.h"
-#include "modules/audio_coding/neteq/statistics_calculator.h"
 #include "modules/include/module_common_types_public.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
@@ -108,7 +107,6 @@
                            bool enable_rtx_handling,
                            DelayPeakDetector* peak_detector,
                            const TickTimer* tick_timer,
-                           StatisticsCalculator* statistics,
                            std::unique_ptr<Histogram> histogram)
     : first_packet_received_(false),
       max_packets_in_buffer_(max_packets_in_buffer),
@@ -116,7 +114,6 @@
       histogram_quantile_(histogram_quantile),
       histogram_mode_(histogram_mode),
       tick_timer_(tick_timer),
-      statistics_(statistics),
       base_minimum_delay_ms_(base_minimum_delay_ms),
       effective_minimum_delay_ms_(base_minimum_delay_ms),
       base_target_level_(4),                   // In Q0 domain.
@@ -144,8 +141,7 @@
     int base_minimum_delay_ms,
     bool enable_rtx_handling,
     DelayPeakDetector* peak_detector,
-    const TickTimer* tick_timer,
-    StatisticsCalculator* statistics) {
+    const TickTimer* tick_timer) {
   const HistogramMode mode = RELATIVE_ARRIVAL_DELAY;
   DelayHistogramConfig config = GetDelayHistogramConfig();
   const int quantile = config.quantile;
@@ -153,17 +149,16 @@
       kDelayBuckets, config.forget_factor, config.start_forget_weight);
   return std::make_unique<DelayManager>(
       max_packets_in_buffer, base_minimum_delay_ms, quantile, mode,
-      enable_rtx_handling, peak_detector, tick_timer, statistics,
-      std::move(histogram));
+      enable_rtx_handling, peak_detector, tick_timer, std::move(histogram));
 }
 
 DelayManager::~DelayManager() {}
 
-int DelayManager::Update(uint16_t sequence_number,
-                         uint32_t timestamp,
-                         int sample_rate_hz) {
+absl::optional<int> DelayManager::Update(uint16_t sequence_number,
+                                         uint32_t timestamp,
+                                         int sample_rate_hz) {
   if (sample_rate_hz <= 0) {
-    return -1;
+    return absl::nullopt;
   }
 
   if (!first_packet_received_) {
@@ -172,7 +167,7 @@
     last_seq_no_ = sequence_number;
     last_timestamp_ = timestamp;
     first_packet_received_ = true;
-    return 0;
+    return absl::nullopt;
   }
 
   // Try calculating packet length from current and previous timestamps.
@@ -191,6 +186,7 @@
   }
 
   bool reordered = false;
+  absl::optional<int> relative_delay;
   if (packet_len_ms > 0) {
     // Cannot update statistics unless |packet_len_ms| is valid.
 
@@ -215,18 +211,16 @@
     }
 
     int iat_delay = iat_ms - packet_len_ms;
-    int relative_delay;
     if (reordered) {
       relative_delay = std::max(iat_delay, 0);
     } else {
       UpdateDelayHistory(iat_delay, timestamp, sample_rate_hz);
       relative_delay = CalculateRelativePacketArrivalDelay();
     }
-    statistics_->RelativePacketArrivalDelay(relative_delay);
 
     switch (histogram_mode_) {
       case RELATIVE_ARRIVAL_DELAY: {
-        const int index = relative_delay / kBucketSizeMs;
+        const int index = relative_delay.value() / kBucketSizeMs;
         if (index < histogram_->NumBuckets()) {
           // Maximum delay to register is 2000 ms.
           histogram_->Add(index);
@@ -250,14 +244,14 @@
   if (enable_rtx_handling_ && reordered &&
       num_reordered_packets_ < kMaxReorderedPackets) {
     ++num_reordered_packets_;
-    return 0;
+    return relative_delay;
   }
   num_reordered_packets_ = 0;
   // Prepare for next packet arrival.
   packet_iat_stopwatch_ = tick_timer_->GetNewStopwatch();
   last_seq_no_ = sequence_number;
   last_timestamp_ = timestamp;
-  return 0;
+  return relative_delay;
 }
 
 void DelayManager::UpdateDelayHistory(int iat_delay_ms,