commit 133cff009b7677af4649c282f1e2546da4dba975
author Karl Wiberg <kwiberg@webrtc.org> Fri Jul 06 15:40:14 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Aug 08 01:38:05 2018 +0000
tree 4ab04b21687ba85b52ff6c2dfa4538a8705aab46
parent 191f46c5c1ce4853b1a05b2b337a85bee204bec7

AudioCodingModuleTest.TestAllCodecs: Create audio encoders the new way

Specifically, don't expect the ACM to be able to create encoders; we
have to give it an encoder that we make ourselves.

To make it work, I had to add support for the "ptime" parameter to the
L16 codec.

Bug: webrtc:8396
Change-Id: I3869422882611d2eed65d6c849ea7cd3ad6bd126
Reviewed-on: https://webrtc-review.googlesource.com/87423
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24217}

modules/audio_coding/BUILD.gn

diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 8cda506..380f1bc 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1327,6 +1327,7 @@
       "../..:webrtc_common",
       "../../api/audio:audio_frame_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../api/audio_codecs:builtin_audio_encoder_factory",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:rw_lock_wrapper",

modules/audio_coding/test/TestAllCodecs.cc

diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc
index f78b705..781337c 100644
--- a/modules/audio_coding/test/TestAllCodecs.cc
+++ b/modules/audio_coding/test/TestAllCodecs.cc
@@ -15,12 +15,14 @@
 #include <string>
 
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/audio_format_conversion.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "modules/audio_coding/test/utility.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringencode.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
 
@@ -405,7 +407,14 @@
                                        sampling_freq_hz, 1));
   my_codec_param.rate = rate;
   my_codec_param.pacsize = packet_size;
-  CHECK_ERROR(my_acm->RegisterSendCodec(my_codec_param));
+
+  auto factory = CreateBuiltinAudioEncoderFactory();
+  constexpr int payload_type = 17;
+  SdpAudioFormat format = CodecInstToSdp(my_codec_param);
+  format.parameters["ptime"] = rtc::ToString(rtc::CheckedDivExact(
+      packet_size, rtc::CheckedDivExact(sampling_freq_hz, 1000)));
+  my_acm->SetEncoder(
+      factory->MakeAudioEncoder(payload_type, format, absl::nullopt));
 }
 
 void TestAllCodecs::Run(TestPack* channel) {