G722 implementation of the AudioEncoderFactoryTemplate API

webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc

 /*
  *  Copyright (c) 2017 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.
  */
 
 #include "webrtc/api/audio_codecs/audio_encoder_factory_template.h"
+#include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h"
 #include "webrtc/api/audio_codecs/opus/audio_encoder_opus.h"
 #include "webrtc/base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"
 
 namespace webrtc {
 
 namespace {
 
@@ skipping 90 matching lines @@
   auto enc1 = factory->MakeAudioEncoder(17, {"bogus", 8000, 1});
   ASSERT_NE(nullptr, enc1);
   EXPECT_EQ(8000, enc1->SampleRateHz());
   EXPECT_EQ(nullptr, factory->MakeAudioEncoder(17, {"sham", 16000, 2}));
   auto enc2 =
       factory->MakeAudioEncoder(17, {"sham", 16000, 2, {{"param", "value"}}});
   ASSERT_NE(nullptr, enc2);
   EXPECT_EQ(16000, enc2->SampleRateHz());
 }
 
+TEST(AudioEncoderFactoryTemplateTest, G722) {

[the sun, 2017/06/13 14:49:30]

I guess the idea is to eventually move this test case to the unit test for
BuiltInEncoderFactory?

[kwiberg-webrtc, 2017/06/13 19:12:10]

I hadn't in fact thought that far ahead, but yes, that sounds like a good idea.

+  auto factory = CreateAudioEncoderFactory<AudioEncoderG722>();
+  EXPECT_THAT(factory->GetSupportedEncoders(),
+              testing::ElementsAre(
+                  AudioCodecSpec{{"g722", 8000, 1}, {16000, 1, 64000}}));
+  EXPECT_EQ(rtc::Optional<AudioCodecInfo>(),
+            factory->QueryAudioEncoder({"foo", 8000, 1}));
+  EXPECT_EQ(rtc::Optional<AudioCodecInfo>({16000, 1, 64000}),
+            factory->QueryAudioEncoder({"g722", 8000, 1}));
+  EXPECT_EQ(nullptr, factory->MakeAudioEncoder(17, {"bar", 16000, 1}));
+  auto enc = factory->MakeAudioEncoder(17, {"g722", 8000, 1});
+  ASSERT_NE(nullptr, enc);
+  EXPECT_EQ(16000, enc->SampleRateHz());
+}
+
 TEST(AudioEncoderFactoryTemplateTest, Opus) {
   auto factory = CreateAudioEncoderFactory<AudioEncoderOpus>();
   AudioCodecInfo info = {48000, 1, 32000, 6000, 510000};
   info.allow_comfort_noise = false;
   info.supports_network_adaption = true;
   EXPECT_THAT(
       factory->GetSupportedEncoders(),
       testing::ElementsAre(AudioCodecSpec{
           {"opus", 48000, 2, {{"minptime", "10"}, {"useinbandfec", "1"}}},
           info}));
   EXPECT_EQ(rtc::Optional<AudioCodecInfo>(),
             factory->QueryAudioEncoder({"foo", 8000, 1}));
   EXPECT_EQ(
       rtc::Optional<AudioCodecInfo>(info),
       factory->QueryAudioEncoder(
           {"opus", 48000, 2, {{"minptime", "10"}, {"useinbandfec", "1"}}}));
   EXPECT_EQ(nullptr, factory->MakeAudioEncoder(17, {"bar", 16000, 1}));
   auto enc = factory->MakeAudioEncoder(17, {"opus", 48000, 2});
   ASSERT_NE(nullptr, enc);
   EXPECT_EQ(48000, enc->SampleRateHz());
 }
 
 }  // namespace webrtc