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

Unified Diff: webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc

Issue 2669583002: Added a flag to AudioCodecSpec to indicate adaptive bitrate support. (Closed)
Patch Set: int -> size_t to avoid unsigned/signed mismatch warnings on Windows. Created 3 years, 10 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/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 e40a0e65989e820c05be06c23adbaa4f932c03f3..5f14f97d92233a3cd72594c8b9f3731b64fabfad 100644
--- a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc
+++ b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc
@@ -174,31 +174,36 @@ NamedDecoderConstructor decoder_constructors[] = {
class BuiltinAudioDecoderFactory : public AudioDecoderFactory {
public:
std::vector<AudioCodecSpec> GetSupportedDecoders() override {
- static std::vector<AudioCodecSpec> specs = {
+ // Although this looks a bit strange, it means specs need only be initalized
+ // once, and that that initialization is thread-safe.
+ static std::vector<AudioCodecSpec> specs =
+ []{
+ std::vector<AudioCodecSpec> specs;
#ifdef WEBRTC_CODEC_OPUS
- { { "opus", 48000, 2, {
- {"minptime", "10" },
- {"useinbandfec", "1" }
- }
- }, false
- },
+ AudioCodecSpec opus({"opus", 48000, 2, {
+ {"minptime", "10"},
+ {"useinbandfec", "1"}
+ }});
+ opus.allow_comfort_noise = false;
+ opus.supports_network_adaption = true;
+ specs.push_back(opus);
#endif
#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
- {{"isac", 16000, 1}, true},
+ specs.push_back(AudioCodecSpec({"isac", 16000, 1}));
#endif
#if (defined(WEBRTC_CODEC_ISAC))
- {{"isac", 32000, 1}, true},
+ specs.push_back(AudioCodecSpec({"isac", 32000, 1}));
#endif
#ifdef WEBRTC_CODEC_G722
- {{"G722", 8000, 1}, true},
+ specs.push_back(AudioCodecSpec({"G722", 8000, 1}));
#endif
#ifdef WEBRTC_CODEC_ILBC
- {{"iLBC", 8000, 1}, true},
+ specs.push_back(AudioCodecSpec({"iLBC", 8000, 1}));
#endif
- {{"PCMU", 8000, 1}, true},
- {{"PCMA", 8000, 1}, true}
- };
-
+ specs.push_back(AudioCodecSpec({"PCMU", 8000, 1}));
+ specs.push_back(AudioCodecSpec({"PCMA", 8000, 1}));
+ return specs;
+ }();
return specs;
}

Powered by Google App Engine
This is Rietveld 408576698