From 7f30dd11ebace6b00367a42437583fecfbdea2ab Mon Sep 17 00:00:00 2001
From: Tommi <tommi@webrtc.org>
Date: Thu, 4 Jul 2024 13:38:38 +0200
Subject: [PATCH] Remove deprecated methods

follow up to https://webrtc-review.googlesource.com/c/src/+/352582

Bug: chromium:335805780
Change-Id: I47f2842da9e86b686e3a3c2f4f28fa03d1cd297d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356241
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42589}
---
 .../agc2/fixed_digital_level_estimator.h           |  6 ------
 modules/audio_processing/agc2/limiter.cc           |  8 --------
 modules/audio_processing/agc2/limiter.h            | 14 --------------
 3 files changed, 28 deletions(-)

diff --git a/modules/audio_processing/agc2/fixed_digital_level_estimator.h b/modules/audio_processing/agc2/fixed_digital_level_estimator.h
index af102508e2..1669acdc71 100644
--- a/modules/audio_processing/agc2/fixed_digital_level_estimator.h
+++ b/modules/audio_processing/agc2/fixed_digital_level_estimator.h
@@ -48,12 +48,6 @@ class FixedDigitalLevelEstimator {
   std::array<float, kSubFramesInFrame> ComputeLevel(
       DeinterleavedView<const float> float_frame);
 
-  [[deprecated(
-      "Use DeinterleavedView variant")]] std::array<float, kSubFramesInFrame>
-  ComputeLevel(const AudioFrameView<const float>& float_frame) {
-    return ComputeLevel(float_frame.view());
-  }
-
   // Rate may be changed at any time (but not concurrently) from the
   // value passed to the constructor. The class is not thread safe.
   void SetSamplesPerChannel(size_t samples_per_channel);
diff --git a/modules/audio_processing/agc2/limiter.cc b/modules/audio_processing/agc2/limiter.cc
index 270dc13ad8..7a99b94dce 100644
--- a/modules/audio_processing/agc2/limiter.cc
+++ b/modules/audio_processing/agc2/limiter.cc
@@ -95,14 +95,6 @@ Limiter::Limiter(ApmDataDumper* apm_data_dumper,
   RTC_DCHECK_LE(samples_per_channel, kMaximalNumberOfSamplesPerChannel);
 }
 
-// Deprecated ctor.
-Limiter::Limiter(int sample_rate_hz,
-                 ApmDataDumper* apm_data_dumper,
-                 absl::string_view histogram_name_prefix)
-    : Limiter(apm_data_dumper,
-              SampleRateToDefaultChannelSize(sample_rate_hz),
-              histogram_name_prefix) {}
-
 Limiter::~Limiter() = default;
 
 void Limiter::Process(DeinterleavedView<float> signal) {
diff --git a/modules/audio_processing/agc2/limiter.h b/modules/audio_processing/agc2/limiter.h
index f5244be0a8..55cb1a5b15 100644
--- a/modules/audio_processing/agc2/limiter.h
+++ b/modules/audio_processing/agc2/limiter.h
@@ -29,11 +29,6 @@ class Limiter {
           size_t samples_per_channel,
           absl::string_view histogram_name_prefix);
 
-  [[deprecated("Use constructor that accepts samples_per_channel")]] Limiter(
-      int sample_rate_hz,
-      ApmDataDumper* apm_data_dumper,
-      absl::string_view histogram_name_prefix);
-
   Limiter(const Limiter& limiter) = delete;
   Limiter& operator=(const Limiter& limiter) = delete;
   ~Limiter();
@@ -41,10 +36,6 @@ class Limiter {
   // Applies limiter and hard-clipping to `signal`.
   void Process(DeinterleavedView<float> signal);
 
-  [[deprecated("Use DeinterleavedView version")]] void Process(
-      AudioFrameView<float> signal) {
-    return Process(signal.view());
-  }
   InterpolatedGainCurve::Stats GetGainCurveStats() const;
 
   // Supported values must be
@@ -53,11 +44,6 @@ class Limiter {
   //   fit in the per_sample_scaling_factors_ array.
   void SetSamplesPerChannel(size_t samples_per_channel);
 
-  [[deprecated("Use SetSamplesPerChannel")]] void SetSampleRate(
-      int sample_rate_hz) {
-    SetSamplesPerChannel(SampleRateToDefaultChannelSize(sample_rate_hz));
-  }
-
   // Resets the internal state.
   void Reset();