Chromium Code Reviews| Index: webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc |
| diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc |
| index 48b2f5d437312de30531837bda4c34fb9ca04732..a7f740489210686894105159cb103d1c25b9c5bb 100644 |
| --- a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc |
| +++ b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc |
| @@ -130,7 +130,31 @@ NamedDecoderConstructor decoder_constructors[] = { |
| class BuiltinAudioDecoderFactory : public AudioDecoderFactory { |
| public: |
| std::vector<SdpAudioFormat> GetSupportedFormats() override { |
| - FATAL() << "Not implemented yet!"; |
| + static std::vector<SdpAudioFormat> formats = { |
| +#ifdef WEBRTC_CODEC_OPUS |
| + { "opus", 48000, 2, { |
| + {"minptime", "10" }, |
| + {"useinbandfec", "1" } |
| + } |
| + }, |
| +#endif |
| +#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) |
| + { "isac", 16000, 1 }, |
| +#endif |
| +#if (defined(WEBRTC_CODEC_ISAC)) |
|
ossu
2016/07/12 15:49:49
This is why the tests failed on android: we preten
|
| + { "isac", 32000, 1 }, |
| +#endif |
| +#ifdef WEBRTC_CODEC_G722 |
| + { "G722", 8000, 1 }, |
| +#endif |
| +#ifdef WEBRTC_CODEC_ILBC |
| + { "iLBC", 8000, 1 }, |
| +#endif |
| + { "PCMU", 8000, 1 }, |
| + { "PCMA", 8000, 1 } |
| + }; |
| + |
| + return formats; |
| } |
| std::unique_ptr<AudioDecoder> MakeAudioDecoder( |