commit 4d598037a88295cde79a531b77438e4b07e3ef8a
author Emil Lundmark <lndmrk@webrtc.org> Thu Apr 04 11:13:58 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Apr 06 08:57:52 2024
tree f322f8e748e4601fc34c3ff61f74f3e201718aec
parent 604b4db346d3101870407add8b24543cc7bef051

Remove expired WebRTC-Audio-NetEqFecDelayAdaptation

Bug: webrtc:13322
Change-Id: I50d2ffb16656bd485658cd6c379fa7e834ca1cf8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345702
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42009}

experiments/field_trials.py

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index 9be0f06..c413726 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -47,9 +47,6 @@
     FieldTrial('WebRTC-Audio-GainController2',
                'webrtc:7494',
                date(2024, 4, 1)),
-    FieldTrial('WebRTC-Audio-NetEqFecDelayAdaptation',
-               'webrtc:13322',
-               date(2024, 4, 1)),
     FieldTrial('WebRTC-Audio-OpusGeneratePlc',
                'webrtc:13322',
                date(2024, 4, 1)),

modules/audio_coding/neteq/neteq_impl.cc

diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc
index 6a76096..065fd14 100644
--- a/modules/audio_coding/neteq/neteq_impl.cc
+++ b/modules/audio_coding/neteq/neteq_impl.cc
@@ -151,8 +151,6 @@
       accelerate_factory_(std::move(deps.accelerate_factory)),
       preemptive_expand_factory_(std::move(deps.preemptive_expand_factory)),
       stats_(std::move(deps.stats)),
-      enable_fec_delay_adaptation_(
-          !field_trial::IsDisabled("WebRTC-Audio-NetEqFecDelayAdaptation")),
       controller_(std::move(deps.neteq_controller)),
       last_mode_(Mode::kNormal),
       decoded_buffer_length_(kMaxFrameSize),
@@ -502,7 +500,6 @@
   // Store these for later use, since the first packet may very well disappear
   // before we need these values.
   uint32_t main_timestamp = packet_list.front().timestamp;
-  uint8_t main_payload_type = packet_list.front().payload_type;
   uint16_t main_sequence_number = packet_list.front().sequence_number;
 
   // Reinitialize NetEq if it's needed (changed SSRC or first call).
@@ -555,7 +552,6 @@
   if (decoder_database_->IsRed(rtp_header.payloadType)) {
     timestamp_scaler_->ToInternal(&packet_list);
     main_timestamp = packet_list.front().timestamp;
-    main_payload_type = packet_list.front().payload_type;
     main_sequence_number = packet_list.front().sequence_number;
   }
 
@@ -664,14 +660,13 @@
       // An error occurred.
       return kOtherError;
     }
-    if (enable_fec_delay_adaptation_) {
-      info.buffer_flush = buffer_flush_occured;
-      const bool should_update_stats = !new_codec_ && !buffer_flush_occured;
-      auto relative_delay =
-          controller_->PacketArrived(fs_hz_, should_update_stats, info);
-      if (relative_delay) {
-        stats_->RelativePacketArrivalDelay(relative_delay.value());
-      }
+
+    info.buffer_flush = buffer_flush_occured;
+    const bool should_update_stats = !new_codec_ && !buffer_flush_occured;
+    auto relative_delay =
+        controller_->PacketArrived(fs_hz_, should_update_stats, info);
+    if (relative_delay) {
+      stats_->RelativePacketArrivalDelay(relative_delay.value());
     }
   }
 
@@ -723,27 +718,6 @@
     }
   }
 
-  if (!enable_fec_delay_adaptation_) {
-    const DecoderDatabase::DecoderInfo* dec_info =
-        decoder_database_->GetDecoderInfo(main_payload_type);
-    RTC_DCHECK(dec_info);  // Already checked that the payload type is known.
-
-    NetEqController::PacketArrivedInfo info;
-    info.is_cng_or_dtmf = dec_info->IsComfortNoise() || dec_info->IsDtmf();
-    info.packet_length_samples =
-        number_of_primary_packets * decoder_frame_length_;
-    info.main_timestamp = main_timestamp;
-    info.main_sequence_number = main_sequence_number;
-    info.is_dtx = is_dtx;
-    info.buffer_flush = buffer_flush_occured;
-
-    const bool should_update_stats = !new_codec_;
-    auto relative_delay =
-        controller_->PacketArrived(fs_hz_, should_update_stats, info);
-    if (relative_delay) {
-      stats_->RelativePacketArrivalDelay(relative_delay.value());
-    }
-  }
   return 0;
 }
 

modules/audio_coding/neteq/neteq_impl.h

diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h
index eed7645..61bda37 100644
--- a/modules/audio_coding/neteq/neteq_impl.h
+++ b/modules/audio_coding/neteq/neteq_impl.h
@@ -357,7 +357,6 @@
   const std::unique_ptr<PreemptiveExpandFactory> preemptive_expand_factory_
       RTC_GUARDED_BY(mutex_);
   const std::unique_ptr<StatisticsCalculator> stats_ RTC_GUARDED_BY(mutex_);
-  const bool enable_fec_delay_adaptation_ RTC_GUARDED_BY(mutex_);
 
   std::unique_ptr<BackgroundNoise> background_noise_ RTC_GUARDED_BY(mutex_);
   std::unique_ptr<NetEqController> controller_ RTC_GUARDED_BY(mutex_);