| Index: webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
|
| diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc b/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
|
| index 897eed23f421f2863aa73152c72cd4ede9fb2b37..7b4a919d7c7b5311c7686ec3d5968c5a2632c89f 100644
|
| --- a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
|
| +++ b/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
|
| @@ -16,7 +16,6 @@
|
| #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
|
| #include "webrtc/rtc_base/checks.h"
|
| #include "webrtc/rtc_base/safe_conversions.h"
|
| -#include "webrtc/rtc_base/string_to_number.h"
|
|
|
| namespace webrtc {
|
|
|
| @@ -35,6 +34,7 @@ AudioEncoder::CodecType AudioEncoderPcm16B::GetCodecType() const {
|
| }
|
|
|
| namespace {
|
| +
|
| AudioEncoderPcm16B::Config CreateConfig(const CodecInst& codec_inst) {
|
| AudioEncoderPcm16B::Config config;
|
| config.num_channels = codec_inst.channels;
|
| @@ -45,23 +45,6 @@ AudioEncoderPcm16B::Config CreateConfig(const CodecInst& codec_inst) {
|
| return config;
|
| }
|
|
|
| -AudioEncoderPcm16B::Config CreateConfig(int payload_type,
|
| - const SdpAudioFormat& format) {
|
| - AudioEncoderPcm16B::Config config;
|
| - config.num_channels = format.num_channels;
|
| - config.sample_rate_hz = format.clockrate_hz;
|
| - config.frame_size_ms = 10;
|
| - auto ptime_iter = format.parameters.find("ptime");
|
| - if (ptime_iter != format.parameters.end()) {
|
| - auto ptime = rtc::StringToNumber<int>(ptime_iter->second);
|
| - if (ptime && *ptime > 0) {
|
| - const int whole_packets = *ptime / 10;
|
| - config.frame_size_ms = std::max(10, std::min(whole_packets * 10, 60));
|
| - }
|
| - }
|
| - config.payload_type = payload_type;
|
| - return config;
|
| -}
|
| } // namespace
|
|
|
| bool AudioEncoderPcm16B::Config::IsOk() const {
|
| @@ -74,24 +57,4 @@ bool AudioEncoderPcm16B::Config::IsOk() const {
|
| AudioEncoderPcm16B::AudioEncoderPcm16B(const CodecInst& codec_inst)
|
| : AudioEncoderPcm16B(CreateConfig(codec_inst)) {}
|
|
|
| -AudioEncoderPcm16B::AudioEncoderPcm16B(int payload_type,
|
| - const SdpAudioFormat& format)
|
| - : AudioEncoderPcm16B(CreateConfig(payload_type, format)) {}
|
| -
|
| -rtc::Optional<AudioCodecInfo> AudioEncoderPcm16B::QueryAudioEncoder(
|
| - const SdpAudioFormat& format) {
|
| - if (STR_CASE_CMP(format.name.c_str(), GetPayloadName()) == 0 &&
|
| - format.num_channels >= 1) {
|
| - Config config = CreateConfig(0, format);
|
| - if (config.IsOk()) {
|
| - constexpr int bits_per_sample = 16;
|
| - return rtc::Optional<AudioCodecInfo>(
|
| - {config.sample_rate_hz, config.num_channels,
|
| - config.sample_rate_hz * bits_per_sample *
|
| - rtc::dchecked_cast<int>(config.num_channels)});
|
| - }
|
| - }
|
| - return rtc::Optional<AudioCodecInfo>();
|
| -}
|
| -
|
| } // namespace webrtc
|
|
|