From 69320420504cbdf33cd4822f51c1902bb91d1f85 Mon Sep 17 00:00:00 2001
From: Emil Lundmark <lndmrk@webrtc.org>
Date: Thu, 4 Apr 2024 13:36:32 +0200
Subject: [PATCH] Remove expired WebRTC-Audio-OpusSetSignalVoiceWithDtx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:4559
Change-Id: I060ee6a6d4bbb3329dfdf7d6819a3d346da6a8b8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345720
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42000}
---
 experiments/field_trials.py                       |  3 ---
 .../audio_coding/codecs/opus/opus_interface.cc    | 15 ---------------
 2 files changed, 18 deletions(-)

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index 38113f7a7e..27dfcb6dfe 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -50,9 +50,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
     FieldTrial('WebRTC-Audio-NetEqFecDelayAdaptation',
                'webrtc:13322',
                date(2024, 4, 1)),
-    FieldTrial('WebRTC-Audio-OpusSetSignalVoiceWithDtx',
-               'webrtc:4559',
-               date(2024, 4, 1)),
     FieldTrial('WebRTC-Audio-OpusGeneratePlc',
                'webrtc:13322',
                date(2024, 4, 1)),
diff --git a/modules/audio_coding/codecs/opus/opus_interface.cc b/modules/audio_coding/codecs/opus/opus_interface.cc
index 64a1f59237..a3ba428120 100644
--- a/modules/audio_coding/codecs/opus/opus_interface.cc
+++ b/modules/audio_coding/codecs/opus/opus_interface.cc
@@ -41,9 +41,6 @@ constexpr char kPlcUsePrevDecodedSamplesFieldTrial[] =
 constexpr char kAvoidNoisePumpingDuringDtxFieldTrial[] =
     "WebRTC-Audio-OpusAvoidNoisePumpingDuringDtx";
 
-constexpr char kSetSignalVoiceWithDtxFieldTrial[] =
-    "WebRTC-Audio-OpusSetSignalVoiceWithDtx";
-
 static int FrameSizePerChannel(int frame_size_ms, int sample_rate_hz) {
   RTC_DCHECK_GT(frame_size_ms, 0);
   RTC_DCHECK_EQ(frame_size_ms % 10, 0);
@@ -361,12 +358,6 @@ int16_t WebRtcOpus_DisableFec(OpusEncInst* inst) {
 
 int16_t WebRtcOpus_EnableDtx(OpusEncInst* inst) {
   if (inst) {
-    if (webrtc::field_trial::IsEnabled(kSetSignalVoiceWithDtxFieldTrial)) {
-      int ret = ENCODER_CTL(inst, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-      if (ret != OPUS_OK) {
-        return ret;
-      }
-    }
     return ENCODER_CTL(inst, OPUS_SET_DTX(1));
   } else {
     return -1;
@@ -375,12 +366,6 @@ int16_t WebRtcOpus_EnableDtx(OpusEncInst* inst) {
 
 int16_t WebRtcOpus_DisableDtx(OpusEncInst* inst) {
   if (inst) {
-    if (webrtc::field_trial::IsEnabled(kSetSignalVoiceWithDtxFieldTrial)) {
-      int ret = ENCODER_CTL(inst, OPUS_SET_SIGNAL(OPUS_AUTO));
-      if (ret != OPUS_OK) {
-        return ret;
-      }
-    }
     return ENCODER_CTL(inst, OPUS_SET_DTX(0));
   } else {
     return -1;