Chromium Code Reviews| Index: webrtc/modules/audio_coding/codecs/internal_builtin_audio_decoder_factory.cc |
| diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc b/webrtc/modules/audio_coding/codecs/internal_builtin_audio_decoder_factory.cc |
| similarity index 95% |
| rename from webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc |
| rename to webrtc/modules/audio_coding/codecs/internal_builtin_audio_decoder_factory.cc |
| index e40a0e65989e820c05be06c23adbaa4f932c03f3..23c618dfa83d60357c80028db9f17638d3aefe0f 100644 |
| --- a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc |
| +++ b/webrtc/modules/audio_coding/codecs/internal_builtin_audio_decoder_factory.cc |
| @@ -8,8 +8,9 @@ |
| * be found in the AUTHORS file in the root of the source tree. |
| */ |
| -#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" |
| +#include "webrtc/modules/audio_coding/codecs/internal_builtin_audio_decoder_factory.h" |
| +#include <memory> |
| #include <vector> |
| #include "webrtc/base/checks.h" |
| @@ -176,12 +177,13 @@ class BuiltinAudioDecoderFactory : public AudioDecoderFactory { |
| std::vector<AudioCodecSpec> GetSupportedDecoders() override { |
| static std::vector<AudioCodecSpec> specs = { |
| #ifdef WEBRTC_CODEC_OPUS |
| - { { "opus", 48000, 2, { |
| - {"minptime", "10" }, |
| - {"useinbandfec", "1" } |
| - } |
| - }, false |
| - }, |
| + {{"opus", |
| + 48000, |
| + 2, |
| + { {"minptime", "10"}, |
| + { "useinbandfec", |
|
ossu
2017/02/01 15:05:26
This was highlighted in my CL that clang-formatted
kwiberg-webrtc
2017/02/01 20:15:03
I don't disagree. But again, this line only got ch
ossu
2017/02/06 12:54:16
I do feel quite strongly about this case. clang-fo
kwiberg-webrtc
2017/02/06 14:19:36
OK, I'll make sure this is lovingly hand-formatted
ossu
2017/02/06 14:44:06
Artisanal lines of code - I like it!
|
| + "1" } }}, |
| + false}, |
| #endif |
| #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) |
| {{"isac", 16000, 1}, true}, |
| @@ -234,7 +236,8 @@ class BuiltinAudioDecoderFactory : public AudioDecoderFactory { |
| } // namespace |
| -rtc::scoped_refptr<AudioDecoderFactory> CreateBuiltinAudioDecoderFactory() { |
| +rtc::scoped_refptr<AudioDecoderFactory> |
| +InternalCreateBuiltinAudioDecoderFactory() { |
| return rtc::scoped_refptr<AudioDecoderFactory>( |
| new rtc::RefCountedObject<BuiltinAudioDecoderFactory>); |
| } |