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

Unified Diff: webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.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
« no previous file with comments | « webrtc/api/audio_codecs/ilbc/BUILD.gn ('k') | webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
diff --git a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
index 13a1c2e02941a13b89054275c4c720bead0735a6..fd11f006eb560759ddb8a20e5c4552e34d042a3b 100644
--- a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
+++ b/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
@@ -13,9 +13,12 @@
#include <memory>
#include <vector>
+#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
#include "webrtc/rtc_base/ptr_util.h"
#include "webrtc/rtc_base/safe_conversions.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/string_to_number.h"
namespace webrtc {
namespace {
@@ -37,7 +40,22 @@ int GetIlbcBitrate(int ptime) {
rtc::Optional<AudioEncoderIlbcConfig> AudioEncoderIlbc::SdpToConfig(
const SdpAudioFormat& format) {
- return AudioEncoderIlbcImpl::SdpToConfig(format);
+ if (STR_CASE_CMP(format.name.c_str(), "ILBC") != 0 ||
+ format.clockrate_hz != 8000 || format.num_channels != 1) {
+ return rtc::Optional<AudioEncoderIlbcConfig>();
+ }
+
+ AudioEncoderIlbcConfig config;
+ 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 = rtc::SafeClamp<int>(whole_packets * 10, 20, 60);
+ }
+ }
+ return config.IsOk() ? rtc::Optional<AudioEncoderIlbcConfig>(config)
+ : rtc::Optional<AudioEncoderIlbcConfig>();
}
void AudioEncoderIlbc::AppendSupportedEncoders(
« no previous file with comments | « webrtc/api/audio_codecs/ilbc/BUILD.gn ('k') | webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698