commit ca101e6bb46ac6fa003e5724af4d7eafd910ee78
author Jakob Ivarsson <jakobi@webrtc.org> Mon Apr 04 21:42:55 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 07 15:19:52 2022 +0000
tree f09e4e1485bdefe650ab7035dd2dd11a11aa362b
parent 64cdcc07920ca1919baf949eb0666c2a9d26d6cd

Count consecutive expands by last mode in NetEq decision logic.

This is a slight change in behavior that fixes a bug where all expansions are not counted due to more than 10ms available in the sync buffer, which can happen after repeated expansions.

The counter should also be updated when in muted mode.

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

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 d5a216e..f81535c 100644
--- a/modules/audio_coding/neteq/decision_logic.cc
+++ b/modules/audio_coding/neteq/decision_logic.cc
@@ -39,6 +39,10 @@
   return std::make_unique<DelayManager>(config, neteq_config.tick_timer);
 }
 
+bool IsExpand(NetEq::Mode mode) {
+  return mode == NetEq::Mode::kExpand || mode == NetEq::Mode::kCodecPlc;
+}
+
 }  // namespace
 
 DecisionLogic::DecisionLogic(NetEqController::Config config)
@@ -112,6 +116,12 @@
     cng_state_ = kCngInternalOn;
   }
 
+  if (IsExpand(status.last_mode)) {
+    ++num_consecutive_expands_;
+  } else {
+    num_consecutive_expands_ = 0;
+  }
+
   prev_time_scale_ =
       prev_time_scale_ &&
       (status.last_mode == NetEq::Mode::kAccelerateSuccess ||
@@ -163,9 +173,7 @@
   // Note that the MuteFactor is in Q14, so a value of 16384 corresponds to 1.
   const int target_level_samples =
       delay_manager_->TargetDelayMs() * sample_rate_ / 1000;
-  if ((status.last_mode == NetEq::Mode::kExpand ||
-       status.last_mode == NetEq::Mode::kCodecPlc) &&
-      status.expand_mutefactor < 16384 / 2 &&
+  if (IsExpand(status.last_mode) && status.expand_mutefactor < 16384 / 2 &&
       status.packet_buffer_info.span_samples <
           static_cast<size_t>(target_level_samples * kPostponeDecodingLevel /
                               100) &&
@@ -192,12 +200,8 @@
   }
 }
 
-void DecisionLogic::ExpandDecision(NetEq::Operation operation) {
-  if (operation == NetEq::Operation::kExpand) {
-    num_consecutive_expands_++;
-  } else {
-    num_consecutive_expands_ = 0;
-  }
+void DecisionLogic::NotifyMutedState() {
+  ++num_consecutive_expands_;
 }
 
 absl::optional<int> DecisionLogic::PacketArrived(
@@ -334,10 +338,9 @@
   // Check if we should continue with an ongoing expand because the new packet
   // is too far into the future.
   uint32_t timestamp_leap = available_timestamp - target_timestamp;
-  if ((prev_mode == NetEq::Mode::kExpand ||
-       prev_mode == NetEq::Mode::kCodecPlc) &&
-      !ReinitAfterExpands(timestamp_leap) && !MaxWaitForPacket() &&
-      PacketTooEarly(timestamp_leap) && UnderTargetLevel()) {
+  if (IsExpand(prev_mode) && !ReinitAfterExpands(timestamp_leap) &&
+      !MaxWaitForPacket() && PacketTooEarly(timestamp_leap) &&
+      UnderTargetLevel()) {
     if (play_dtmf) {
       // Still have DTMF to play, so do not do expand.
       return NetEq::Operation::kDtmf;