Injectable audio encoders: BuiltinAudioEncoderFactory

webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc

Index: webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
index 1f3936c8eeeeb92e67d3233c68f63a12cc298c4a..478ae358d1a00afd3820189ed052bc5608bec6b3 100644
--- a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
+++ b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
@@ -12,6 +12,7 @@
 
 #include <limits>
 #include "webrtc/base/checks.h"
+#include "webrtc/base/string_to_number.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
 
@@ -29,6 +30,22 @@ AudioEncoderG722::Config CreateConfig(const CodecInst& codec_inst) {
   return config;
 }
 
+AudioEncoderG722::Config CreateConfig(int payload_type,
+                                      const SdpAudioFormat& format) {
+  AudioEncoderG722::Config config;
+  config.payload_type = payload_type;
+  config.num_channels = format.num_channels;
+  config.frame_size_ms = 20;
+  auto ptime_iter = format.parameters.find("ptime");
+  if (ptime_iter != format.parameters.end()) {
+    auto ptime = rtc::StringToNumber<int>(ptime_iter->second);
+    if (ptime && *ptime > 0) {
+      config.frame_size_ms = *ptime;
+    }
+  }
+  return config;
+}
+
 }  // namespace
 
 bool AudioEncoderG722::Config::IsOk() const {
@@ -58,8 +75,25 @@ AudioEncoderG722::AudioEncoderG722(const Config& config)
 AudioEncoderG722::AudioEncoderG722(const CodecInst& codec_inst)
     : AudioEncoderG722(CreateConfig(codec_inst)) {}
 
+AudioEncoderG722::AudioEncoderG722(int payload_type,
+                                   const SdpAudioFormat& format)
+    : AudioEncoderG722(CreateConfig(payload_type, format)) {}
+
 AudioEncoderG722::~AudioEncoderG722() = default;
 
+rtc::Optional<AudioFormatInfo> AudioEncoderG722::QueryAudioFormat(
+    const SdpAudioFormat& format) {
+  if (STR_CASE_CMP(format.name.c_str(), GetPayloadName()) == 0) {
+    Config config = CreateConfig(0, format);
+    if (format.clockrate_hz == 8000 && config.IsOk()) {
+      return rtc::Optional<AudioFormatInfo>(
+          {kSampleRateHz, config.num_channels, 64000});
+    }
+  }
+  return rtc::Optional<AudioFormatInfo>();
+}
+
+
 int AudioEncoderG722::SampleRateHz() const {
   return kSampleRateHz;
 }