commit 48d784225972b7dd0542acfad7cd2d0eed25ad1c
author Jakob Ivarsson <jakobi@webrtc.org> Thu Feb 16 16:21:20 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 17 16:09:04 2023
tree edfd11ac15391d6ff4a905709c544268b8cb9f61
parent 86163248f427e0bda57ffa2f76e53d76bb0b5366

Disable stop CNG after a timeout.

This is still a behavior that we want, but a more careful rollout is needed.

Bug: webrtc:12790
Change-Id: Ic74c7b4945c0cdeda2b17f52301069424ad91162
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293860
Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39333}

modules/audio_coding/neteq/decision_logic.h

diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h
index 69b13a9..8d1ff4d 100644
--- a/modules/audio_coding/neteq/decision_logic.h
+++ b/modules/audio_coding/neteq/decision_logic.h
@@ -175,7 +175,7 @@
     int reinit_after_expands = 100;
     int deceleration_target_level_offset_ms = 85;
     int packet_history_size_ms = 2000;
-    absl::optional<int> cng_timeout_ms = 1000;
+    absl::optional<int> cng_timeout_ms;
   };
   Config config_;
   std::unique_ptr<DelayManager> delay_manager_;

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 d0473d0..6150c9a 100644
--- a/modules/audio_coding/neteq/decision_logic_unittest.cc
+++ b/modules/audio_coding/neteq/decision_logic_unittest.cc
@@ -18,6 +18,7 @@
 #include "modules/audio_coding/neteq/delay_manager.h"
 #include "modules/audio_coding/neteq/mock/mock_buffer_level_filter.h"
 #include "modules/audio_coding/neteq/mock/mock_delay_manager.h"
+#include "test/field_trial.h"
 #include "test/gtest.h"
 
 namespace webrtc {
@@ -53,6 +54,8 @@
 class DecisionLogicTest : public ::testing::Test {
  protected:
   DecisionLogicTest() {
+    test::ScopedFieldTrials trials(
+        "WebRTC-Audio-NetEqDecisionLogicConfig/cng_timeout_ms:1000/");
     NetEqController::Config config;
     config.tick_timer = &tick_timer_;
     config.allow_time_stretching = true;