From 39ad2d868c9d5731d9f5435d9a4ac81c90840063 Mon Sep 17 00:00:00 2001
From: Lionel Koenig <lionelk@webrtc.org>
Date: Thu, 7 Apr 2022 11:01:26 +0200
Subject: [PATCH] AudioBuffer: Remove deprecated constructor

Removes webrtc::AudioBuffer deprecated constructor.

Bug: webrtc:5298
Change-Id: If8debe990c0358e58fbdc59bfdfb7e4af1f38f00
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257305
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Lionel Koenig <lionelk@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36518}
---
 modules/audio_processing/audio_buffer.cc | 17 +++--------------
 modules/audio_processing/audio_buffer.h  |  6 ------
 test/fuzzers/agc_fuzzer.cc               |  4 ++--
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/modules/audio_processing/audio_buffer.cc b/modules/audio_processing/audio_buffer.cc
index ff6636df87..3dbe1fe072 100644
--- a/modules/audio_processing/audio_buffer.cc
+++ b/modules/audio_processing/audio_buffer.cc
@@ -45,22 +45,11 @@ AudioBuffer::AudioBuffer(size_t input_rate,
                          size_t buffer_num_channels,
                          size_t output_rate,
                          size_t output_num_channels)
-    : AudioBuffer(static_cast<int>(input_rate) / 100,
-                  input_num_channels,
-                  static_cast<int>(buffer_rate) / 100,
-                  buffer_num_channels,
-                  static_cast<int>(output_rate) / 100) {}
-
-AudioBuffer::AudioBuffer(size_t input_num_frames,
-                         size_t input_num_channels,
-                         size_t buffer_num_frames,
-                         size_t buffer_num_channels,
-                         size_t output_num_frames)
-    : input_num_frames_(input_num_frames),
+    : input_num_frames_(static_cast<int>(input_rate) / 100),
       input_num_channels_(input_num_channels),
-      buffer_num_frames_(buffer_num_frames),
+      buffer_num_frames_(static_cast<int>(buffer_rate) / 100),
       buffer_num_channels_(buffer_num_channels),
-      output_num_frames_(output_num_frames),
+      output_num_frames_(static_cast<int>(output_rate) / 100),
       output_num_channels_(0),
       num_channels_(buffer_num_channels),
       num_bands_(NumBandsFromFramesPerChannel(buffer_num_frames_)),
diff --git a/modules/audio_processing/audio_buffer.h b/modules/audio_processing/audio_buffer.h
index ab0af4493c..d866b8bce5 100644
--- a/modules/audio_processing/audio_buffer.h
+++ b/modules/audio_processing/audio_buffer.h
@@ -40,12 +40,6 @@ class AudioBuffer {
               size_t output_rate,
               size_t output_num_channels);
 
-  // The constructor below will be deprecated.
-  AudioBuffer(size_t input_num_frames,
-              size_t input_num_channels,
-              size_t buffer_num_frames,
-              size_t buffer_num_channels,
-              size_t output_num_frames);
   virtual ~AudioBuffer();
 
   AudioBuffer(const AudioBuffer&) = delete;
diff --git a/test/fuzzers/agc_fuzzer.cc b/test/fuzzers/agc_fuzzer.cc
index 890649ab14..597103993e 100644
--- a/test/fuzzers/agc_fuzzer.cc
+++ b/test/fuzzers/agc_fuzzer.cc
@@ -92,8 +92,8 @@ void FuzzGainController(test::FuzzDataHelper* fuzz_data, GainControlImpl* gci) {
   FuzzGainControllerConfig(fuzz_data, gci);
 
   // The audio buffer is used for both capture and render.
-  AudioBuffer audio(samples_per_frame, num_channels, samples_per_frame,
-                    num_channels, samples_per_frame);
+  AudioBuffer audio(sample_rate_hz, num_channels, sample_rate_hz,
+                    num_channels, sample_rate_hz, num_channels);
 
   std::vector<int16_t> packed_render_audio(samples_per_frame);