OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 return new AudioDecoderPcmA; | 552 return new AudioDecoderPcmA; |
553 case kDecoderPCMu_2ch: | 553 case kDecoderPCMu_2ch: |
554 return new AudioDecoderPcmUMultiCh(2); | 554 return new AudioDecoderPcmUMultiCh(2); |
555 case kDecoderPCMa_2ch: | 555 case kDecoderPCMa_2ch: |
556 return new AudioDecoderPcmAMultiCh(2); | 556 return new AudioDecoderPcmAMultiCh(2); |
557 #ifdef WEBRTC_CODEC_ILBC | 557 #ifdef WEBRTC_CODEC_ILBC |
558 case kDecoderILBC: | 558 case kDecoderILBC: |
559 return new AudioDecoderIlbc; | 559 return new AudioDecoderIlbc; |
560 #endif | 560 #endif |
561 #if defined(WEBRTC_CODEC_ISACFX) | 561 #if defined(WEBRTC_CODEC_ISACFX) |
562 case kDecoderISAC: { | 562 case kDecoderISAC: |
563 AudioEncoderDecoderIsacFix::Config config; | 563 return new AudioDecoderIsacFix(); |
564 return new AudioEncoderDecoderIsacFix(config); | |
565 } | |
566 #elif defined(WEBRTC_CODEC_ISAC) | 564 #elif defined(WEBRTC_CODEC_ISAC) |
567 case kDecoderISAC: { | 565 case kDecoderISAC: |
568 AudioEncoderDecoderIsac::Config config; | |
569 config.sample_rate_hz = 16000; | |
570 return new AudioEncoderDecoderIsac(config); | |
571 } | |
572 case kDecoderISACswb: | 566 case kDecoderISACswb: |
573 case kDecoderISACfb: { | 567 case kDecoderISACfb: |
574 AudioEncoderDecoderIsac::Config config; | 568 return new AudioDecoderIsac(); |
575 config.sample_rate_hz = 32000; | |
576 return new AudioEncoderDecoderIsac(config); | |
577 } | |
578 #endif | 569 #endif |
579 #ifdef WEBRTC_CODEC_PCM16 | 570 #ifdef WEBRTC_CODEC_PCM16 |
580 case kDecoderPCM16B: | 571 case kDecoderPCM16B: |
581 case kDecoderPCM16Bwb: | 572 case kDecoderPCM16Bwb: |
582 case kDecoderPCM16Bswb32kHz: | 573 case kDecoderPCM16Bswb32kHz: |
583 case kDecoderPCM16Bswb48kHz: | 574 case kDecoderPCM16Bswb48kHz: |
584 return new AudioDecoderPcm16B; | 575 return new AudioDecoderPcm16B; |
585 case kDecoderPCM16B_2ch: | 576 case kDecoderPCM16B_2ch: |
586 case kDecoderPCM16Bwb_2ch: | 577 case kDecoderPCM16Bwb_2ch: |
587 case kDecoderPCM16Bswb32kHz_2ch: | 578 case kDecoderPCM16Bswb32kHz_2ch: |
(...skipping 22 matching lines...) Expand all Loading... |
610 case kDecoderRED: | 601 case kDecoderRED: |
611 case kDecoderAVT: | 602 case kDecoderAVT: |
612 case kDecoderArbitrary: | 603 case kDecoderArbitrary: |
613 default: { | 604 default: { |
614 return NULL; | 605 return NULL; |
615 } | 606 } |
616 } | 607 } |
617 } | 608 } |
618 | 609 |
619 } // namespace webrtc | 610 } // namespace webrtc |
OLD | NEW |