Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc

Issue 3003603002: Remove dead code (Closed)
Patch Set: Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
index f936e815a765465480709f8fc22437ae6530ce83..4c3e82d0376cc73aa3c835532f4db3fa6954fe6c 100644
--- a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
+++ b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
@@ -17,7 +17,6 @@
#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/string_to_number.h"
namespace webrtc {
@@ -34,27 +33,6 @@ AudioEncoderG722Config CreateConfig(const CodecInst& codec_inst) {
} // namespace
-rtc::Optional<AudioEncoderG722Config> AudioEncoderG722Impl::SdpToConfig(
- const SdpAudioFormat& format) {
- if (STR_CASE_CMP(format.name.c_str(), "g722") != 0 ||
- format.clockrate_hz != 8000) {
- return rtc::Optional<AudioEncoderG722Config>();
- }
-
- AudioEncoderG722Config config;
- config.num_channels = rtc::dchecked_cast<int>(format.num_channels);
- 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));
- }
- }
- return config.IsOk() ? rtc::Optional<AudioEncoderG722Config>(config)
- : rtc::Optional<AudioEncoderG722Config>();
-}
-
AudioEncoderG722Impl::AudioEncoderG722Impl(const AudioEncoderG722Config& config,
int payload_type)
: num_channels_(config.num_channels),
@@ -78,26 +56,8 @@ AudioEncoderG722Impl::AudioEncoderG722Impl(const AudioEncoderG722Config& config,
AudioEncoderG722Impl::AudioEncoderG722Impl(const CodecInst& codec_inst)
: AudioEncoderG722Impl(CreateConfig(codec_inst), codec_inst.pltype) {}
-AudioEncoderG722Impl::AudioEncoderG722Impl(int payload_type,
- const SdpAudioFormat& format)
- : AudioEncoderG722Impl(*SdpToConfig(format), payload_type) {}
-
AudioEncoderG722Impl::~AudioEncoderG722Impl() = default;
-rtc::Optional<AudioCodecInfo> AudioEncoderG722Impl::QueryAudioEncoder(
- const SdpAudioFormat& format) {
- if (STR_CASE_CMP(format.name.c_str(), GetPayloadName()) == 0) {
- const auto config_opt = SdpToConfig(format);
- if (format.clockrate_hz == 8000 && config_opt) {
- RTC_DCHECK(config_opt->IsOk());
- return rtc::Optional<AudioCodecInfo>(
- {rtc::dchecked_cast<int>(kSampleRateHz),
- rtc::dchecked_cast<size_t>(config_opt->num_channels), 64000});
- }
- }
- return rtc::Optional<AudioCodecInfo>();
-}
-
int AudioEncoderG722Impl::SampleRateHz() const {
return kSampleRateHz;
}

Powered by Google App Engine
This is Rietveld 408576698