diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 3331648d20..474e461387 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -304,25 +304,6 @@ std::unique_ptr AudioEncoderOpusImpl::MakeAudioEncoder( return absl::make_unique(config, payload_type); } -absl::optional AudioEncoderOpusImpl::QueryAudioEncoder( - const SdpAudioFormat& format) { - if (absl::EqualsIgnoreCase(format.name, GetPayloadName()) && - format.clockrate_hz == kRtpTimestampRateHz && format.num_channels == 2) { - const size_t num_channels = GetChannelCount(format); - const int bitrate = - CalculateBitrate(GetMaxPlaybackRate(format), num_channels, - GetFormatParameter(format, "maxaveragebitrate")); - AudioCodecInfo info(kRtpTimestampRateHz, num_channels, bitrate, - AudioEncoderOpusConfig::kMinBitrateBps, - AudioEncoderOpusConfig::kMaxBitrateBps); - info.allow_comfort_noise = false; - info.supports_network_adaption = true; - - return info; - } - return absl::nullopt; -} - absl::optional AudioEncoderOpusImpl::SdpToConfig( const SdpAudioFormat& format) { if (!absl::EqualsIgnoreCase(format.name, "opus") || diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h index 5b92a18940..51db6618df 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -81,11 +81,6 @@ class AudioEncoderOpusImpl final : public AudioEncoder { AudioEncoderOpusImpl(int payload_type, const SdpAudioFormat& format); ~AudioEncoderOpusImpl() override; - // Static interface for use by BuiltinAudioEncoderFactory. - static constexpr const char* GetPayloadName() { return "opus"; } - static absl::optional QueryAudioEncoder( - const SdpAudioFormat& format); - int SampleRateHz() const override; size_t NumChannels() const override; int RtpTimestampRateHz() const override;