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

Unified Diff: webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

Issue 1208993010: iSAC: Make separate AudioEncoder and AudioDecoder objects (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: review fixes Created 5 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/neteq/audio_decoder_impl.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
index 6a9b953f23a3a9d9db5f683a3820afebb9b49a2e..53dc0335a46c57bacd937ffbd27e115e40c92b98 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
@@ -559,22 +559,13 @@ AudioDecoder* CreateAudioDecoder(NetEqDecoder codec_type) {
return new AudioDecoderIlbc;
#endif
#if defined(WEBRTC_CODEC_ISACFX)
- case kDecoderISAC: {
- AudioEncoderDecoderIsacFix::Config config;
- return new AudioEncoderDecoderIsacFix(config);
- }
+ case kDecoderISAC:
+ return new AudioDecoderIsacFix();
#elif defined(WEBRTC_CODEC_ISAC)
- case kDecoderISAC: {
- AudioEncoderDecoderIsac::Config config;
- config.sample_rate_hz = 16000;
- return new AudioEncoderDecoderIsac(config);
- }
+ case kDecoderISAC:
case kDecoderISACswb:
- case kDecoderISACfb: {
- AudioEncoderDecoderIsac::Config config;
- config.sample_rate_hz = 32000;
- return new AudioEncoderDecoderIsac(config);
- }
+ case kDecoderISACfb:
+ return new AudioDecoderIsac();
#endif
#ifdef WEBRTC_CODEC_PCM16
case kDecoderPCM16B:

Powered by Google App Engine
This is Rietveld 408576698