Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / neteq / audio_decoder.cc

diff --git a/src/third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc b/src/third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc
index 0fdaa44..d5a2762 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc
+++ b/src/third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
 
 namespace webrtc {
@@ -51,7 +52,10 @@ bool AudioDecoder::PacketHasFec(const uint8_t* encoded,
   return false;
 }
 
-NetEqDecoder AudioDecoder::codec_type() const { return codec_type_; }
+CNG_dec_inst* AudioDecoder::CngDecoderInstance() {
+  FATAL() << "Not a CNG decoder";
+  return NULL;
+}
 
 bool AudioDecoder::CodecSupported(NetEqDecoder codec_type) {
   switch (codec_type) {
@@ -197,26 +201,24 @@ AudioDecoder* AudioDecoder::CreateAudioDecoder(NetEqDecoder codec_type) {
       return new AudioDecoderIsacFix;
 #elif defined(WEBRTC_CODEC_ISAC)
     case kDecoderISAC:
-      return new AudioDecoderIsac;
-#endif
-#ifdef WEBRTC_CODEC_ISAC
+      return new AudioDecoderIsac(16000);
     case kDecoderISACswb:
-      return new AudioDecoderIsacSwb;
     case kDecoderISACfb:
-      return new AudioDecoderIsacFb;
+      return new AudioDecoderIsac(32000);
 #endif
 #ifdef WEBRTC_CODEC_PCM16
     case kDecoderPCM16B:
     case kDecoderPCM16Bwb:
     case kDecoderPCM16Bswb32kHz:
     case kDecoderPCM16Bswb48kHz:
-      return new AudioDecoderPcm16B(codec_type);
+      return new AudioDecoderPcm16B;
     case kDecoderPCM16B_2ch:
     case kDecoderPCM16Bwb_2ch:
     case kDecoderPCM16Bswb32kHz_2ch:
     case kDecoderPCM16Bswb48kHz_2ch:
+      return new AudioDecoderPcm16BMultiCh(2);
     case kDecoderPCM16B_5ch:
-      return new AudioDecoderPcm16BMultiCh(codec_type);
+      return new AudioDecoderPcm16BMultiCh(5);
 #endif
 #ifdef WEBRTC_CODEC_G722
     case kDecoderG722:
@@ -226,19 +228,21 @@ AudioDecoder* AudioDecoder::CreateAudioDecoder(NetEqDecoder codec_type) {
 #endif
 #ifdef WEBRTC_CODEC_CELT
     case kDecoderCELT_32:
+      return new AudioDecoderCelt(1);
     case kDecoderCELT_32_2ch:
-      return new AudioDecoderCelt(codec_type);
+      return new AudioDecoderCelt(2);
 #endif
 #ifdef WEBRTC_CODEC_OPUS
     case kDecoderOpus:
+      return new AudioDecoderOpus(1);
     case kDecoderOpus_2ch:
-      return new AudioDecoderOpus(codec_type);
+      return new AudioDecoderOpus(2);
 #endif
     case kDecoderCNGnb:
     case kDecoderCNGwb:
     case kDecoderCNGswb32kHz:
     case kDecoderCNGswb48kHz:
-      return new AudioDecoderCng(codec_type);
+      return new AudioDecoderCng;
     case kDecoderRED:
     case kDecoderAVT:
     case kDecoderArbitrary: