commit 45065a749da409a4fa128907139aedfee35d4a19
author Danil Chapovalov <danilchap@webrtc.org> Tue Sep 03 16:37:05 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 04 07:17:59 2024
tree 457acb2e5f4c19d1fd81ee47beec425f882f5387
parent 40a038efa48052e499cc692919ccb60b1c2a82df

Delete deprecated AudioDecoderFactory::MakeAudioDecoder

Bug: webrtc:356878416
Change-Id: I672796e5ec749c3ae0141802922951d4fc562d78
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359680
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42938}

api/audio_codecs/audio_decoder_factory.h

diff --git a/api/audio_codecs/audio_decoder_factory.h b/api/audio_codecs/audio_decoder_factory.h
index a1ef2ca..3b09486 100644
--- a/api/audio_codecs/audio_decoder_factory.h
+++ b/api/audio_codecs/audio_decoder_factory.h
@@ -21,7 +21,6 @@
 #include "api/audio_codecs/audio_format.h"
 #include "api/environment/environment.h"
 #include "api/ref_count.h"
-#include "rtc_base/checks.h"
 
 namespace webrtc {
 
@@ -46,25 +45,10 @@
   // Note: Implementations need to be robust against combinations other than
   // one encoder, one decoder getting the same ID; such decoders must still
   // work.
-  [[deprecated("bugs.webrtc.org/356878416 - Use `Create` instead")]]  //
-  virtual std::unique_ptr<AudioDecoder>
-  MakeAudioDecoder(const SdpAudioFormat& format,
-                   std::optional<AudioCodecPairId> codec_pair_id) {
-    RTC_DCHECK_NOTREACHED();
-    return nullptr;
-  }
-
-  // TODO: bugs.webrtc.org/356878416 - Make pure virtual when  implemented by
-  // derived classes instead of the MakeAudioDecoder.
   virtual absl::Nullable<std::unique_ptr<AudioDecoder>> Create(
       const Environment& env,
       const SdpAudioFormat& format,
-      std::optional<AudioCodecPairId> codec_pair_id) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return MakeAudioDecoder(format, codec_pair_id);
-#pragma clang diagnostic pop
-  }
+      std::optional<AudioCodecPairId> codec_pair_id) = 0;
 };
 
 }  // namespace webrtc

rtc_tools/BUILD.gn

diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index bfd8085..2c99a62 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -360,6 +360,7 @@
         "../api:scoped_refptr",
         "../api/audio_codecs:audio_codecs_api",  # TODO(kwiberg): Remove this
                                                  # dependency.
+        "../api/environment",
         "../api/environment:environment_factory",
         "../api/neteq:neteq_api",
         "../api/rtc_event_log:rtc_event_log",

rtc_tools/rtc_event_log_visualizer/analyze_audio.cc

diff --git a/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc b/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc
index 4fbe9a6..0e60381 100644
--- a/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc
@@ -24,6 +24,7 @@
 #include "api/audio_codecs/audio_decoder.h"
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_format.h"
+#include "api/environment/environment.h"
 #include "api/function_view.h"
 #include "api/make_ref_counted.h"
 #include "api/neteq/neteq.h"
@@ -219,7 +220,8 @@
     return true;
   }
 
-  std::unique_ptr<AudioDecoder> MakeAudioDecoder(
+  std::unique_ptr<AudioDecoder> Create(
+      const Environment& env,
       const SdpAudioFormat& format,
       std::optional<AudioCodecPairId> codec_pair_id) override {
     auto replacement_file = std::make_unique<test::ResampleInputAudioFile>(

test/BUILD.gn

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 42217274..33e920f 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -223,6 +223,7 @@
   deps = [
     "../api/audio_codecs:audio_codecs_api",
     "../api/environment",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "//third_party/abseil-cpp/absl/memory",
   ]

test/audio_decoder_proxy_factory.h

diff --git a/test/audio_decoder_proxy_factory.h b/test/audio_decoder_proxy_factory.h
index 192b417..1fe8bd4 100644
--- a/test/audio_decoder_proxy_factory.h
+++ b/test/audio_decoder_proxy_factory.h
@@ -11,12 +11,20 @@
 #ifndef TEST_AUDIO_DECODER_PROXY_FACTORY_H_
 #define TEST_AUDIO_DECODER_PROXY_FACTORY_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
+#include "api/audio_codecs/audio_codec_pair_id.h"
 #include "api/audio_codecs/audio_decoder.h"
 #include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/audio_codecs/audio_format.h"
+#include "api/environment/environment.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
@@ -39,7 +47,8 @@
     return true;
   }
 
-  std::unique_ptr<AudioDecoder> MakeAudioDecoder(
+  std::unique_ptr<AudioDecoder> Create(
+      const Environment& /* env */,
       const SdpAudioFormat& /* format */,
       std::optional<AudioCodecPairId> /* codec_pair_id */) override {
     return std::make_unique<DecoderProxy>(decoder_);