diff --git a/api/audio_codecs/opus/BUILD.gn b/api/audio_codecs/opus/BUILD.gn index 8c673116de..f96256e3c5 100644 --- a/api/audio_codecs/opus/BUILD.gn +++ b/api/audio_codecs/opus/BUILD.gn @@ -63,12 +63,10 @@ rtc_library("audio_decoder_opus") { ] deps = [ "..:audio_codecs_api", - "../../../api:field_trials_view", "../../../modules/audio_coding:webrtc_opus", "../../../rtc_base:checks", "../../../rtc_base/system:rtc_export", "../../environment", - "../../transport:field_trial_based_config", "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] diff --git a/api/audio_codecs/opus/audio_decoder_opus.cc b/api/audio_codecs/opus/audio_decoder_opus.cc index e1ba301cbd..c19cffce0b 100644 --- a/api/audio_codecs/opus/audio_decoder_opus.cc +++ b/api/audio_codecs/opus/audio_decoder_opus.cc @@ -21,8 +21,6 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_decoder.h" #include "api/audio_codecs/audio_format.h" -#include "api/field_trials_view.h" -#include "api/transport/field_trial_based_config.h" #include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" #include "rtc_base/checks.h" @@ -91,21 +89,4 @@ std::unique_ptr AudioDecoderOpus::MakeAudioDecoder( env.field_trials(), config.num_channels, config.sample_rate_hz); } -std::unique_ptr AudioDecoderOpus::MakeAudioDecoder( - Config config, - absl::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { - if (!config.IsOk()) { - RTC_DCHECK_NOTREACHED(); - return nullptr; - } - if (field_trials == nullptr) { - return std::make_unique( - FieldTrialBasedConfig(), config.num_channels, config.sample_rate_hz); - } else { - return std::make_unique( - *field_trials, config.num_channels, config.sample_rate_hz); - } -} - } // namespace webrtc diff --git a/api/audio_codecs/opus/audio_decoder_opus.h b/api/audio_codecs/opus/audio_decoder_opus.h index 3ab430db3a..c2d5fdaad8 100644 --- a/api/audio_codecs/opus/audio_decoder_opus.h +++ b/api/audio_codecs/opus/audio_decoder_opus.h @@ -19,7 +19,6 @@ #include "api/audio_codecs/audio_decoder.h" #include "api/audio_codecs/audio_format.h" #include "api/environment/environment.h" -#include "api/field_trials_view.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -35,13 +34,6 @@ struct RTC_EXPORT AudioDecoderOpus { static absl::optional SdpToConfig(const SdpAudioFormat& audio_format); static void AppendSupportedDecoders(std::vector* specs); - [[deprecated("bugs.webrtc.org/356878416")]] // - static std::unique_ptr - MakeAudioDecoder( - Config config, - absl::optional codec_pair_id = absl::nullopt, - const FieldTrialsView* field_trials = nullptr); - static std::unique_ptr MakeAudioDecoder(const Environment& env, Config config); static std::unique_ptr MakeAudioDecoder(