Injectable audio encoders: BuiltinAudioEncoderFactory

webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 162 matching lines @@
 };
 
 class BuiltinAudioDecoderFactory : public AudioDecoderFactory {
  public:
   std::vector<AudioCodecSpec> GetSupportedDecoders() override {
     // Although this looks a bit strange, it means specs need only be
     // initialized once, and that that initialization is thread-safe.
     static std::vector<AudioCodecSpec> specs = [] {
       std::vector<AudioCodecSpec> specs;
 #ifdef WEBRTC_CODEC_OPUS
+      AudioFormatInfo opus_info{48000, 1, 64000, 6000, 510000};
       // clang-format off
-      AudioCodecSpec opus({"opus", 48000, 2, {
-                             {"minptime", "10"},
-                             {"useinbandfec", "1"}
-                           }});
+      SdpAudioFormat opus_format({"opus", 48000, 2, {
+            {"minptime", "10"},
+            {"useinbandfec", "1"}
+          }});
       // clang-format on

[kwiberg-webrtc, 2017/03/15 13:33:17]

Why change the formatting?

[ossu, 2017/03/16 18:03:57]

I have no idea. I must have reindented it without thinking.
// ossu-format off

-      opus.allow_comfort_noise = false;
-      opus.supports_network_adaption = true;
-      specs.push_back(opus);
+      opus_info.allow_comfort_noise = false;
+      opus_info.supports_network_adaption = true;

[kwiberg-webrtc, 2017/03/15 13:33:17]

Move these two to just after line 183?

[ossu, 2017/03/16 18:03:57]

Agreed!

+      specs.push_back({opus_format, opus_info});
 #endif
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
-      specs.push_back(AudioCodecSpec({"isac", 16000, 1}));
+      specs.push_back(AudioCodecSpec{{"isac", 16000, 1},
+                                     {16000, 1, 32000, 10000, 56000}});
 #endif
 #if (defined(WEBRTC_CODEC_ISAC))
-      specs.push_back(AudioCodecSpec({"isac", 32000, 1}));
+      specs.push_back(AudioCodecSpec{{"isac", 32000, 1},
+                                     {32000, 1, 56000, 10000, 56000}});
 #endif
 #ifdef WEBRTC_CODEC_G722
-      specs.push_back(AudioCodecSpec({"G722", 8000, 1}));
+      specs.push_back(AudioCodecSpec{{"G722", 8000, 1},
+                                     {16000, 1, 64000}});
 #endif
 #ifdef WEBRTC_CODEC_ILBC
-      specs.push_back(AudioCodecSpec({"iLBC", 8000, 1}));
+      specs.push_back(AudioCodecSpec{{"iLBC", 8000, 1},
+                                     {8000, 1, 13300}});
 #endif
-      specs.push_back(AudioCodecSpec({"PCMU", 8000, 1}));
-      specs.push_back(AudioCodecSpec({"PCMA", 8000, 1}));
+      specs.push_back(AudioCodecSpec{{"PCMU", 8000, 1},
+                                     {8000, 1, 64000}});
+      specs.push_back(AudioCodecSpec{{"PCMA", 8000, 1},
+                                     {8000, 1, 64000}});
       return specs;
-    }();
+      }();
     return specs;
   }
 
   bool IsSupportedDecoder(const SdpAudioFormat& format) override {
     for (const auto& dc : decoder_constructors) {
       if (STR_CASE_CMP(format.name.c_str(), dc.name) == 0) {
         return dc.constructor(format, nullptr);
       }
     }
     return false;
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 rtc::scoped_refptr<AudioDecoderFactory>
 CreateBuiltinAudioDecoderFactoryInternal() {
   return rtc::scoped_refptr<AudioDecoderFactory>(
       new rtc::RefCountedObject<BuiltinAudioDecoderFactory>);
 }
 
 }  // namespace webrtc