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}

api/audio_codecs/L16/BUILD.gn

diff --git a/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
index b1160d4..9724805 100644
--- a/api/audio_codecs/L16/BUILD.gn
+++ b/api/audio_codecs/L16/BUILD.gn
@@ -24,6 +24,7 @@
     "../../..:webrtc_common",
     "../../../modules/audio_coding:pcm16b",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_minmax",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]

api/audio_codecs/L16/audio_encoder_L16.cc

diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc
index 35a3b98..b516f62 100644
--- a/api/audio_codecs/L16/audio_encoder_L16.cc
+++ b/api/audio_codecs/L16/audio_encoder_L16.cc
@@ -15,6 +15,8 @@
 #include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
 #include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "rtc_base/string_to_number.h"
 
 namespace webrtc {
 
@@ -26,6 +28,13 @@
   Config config;
   config.sample_rate_hz = format.clockrate_hz;
   config.num_channels = rtc::dchecked_cast<int>(format.num_channels);
+  auto ptime_iter = format.parameters.find("ptime");
+  if (ptime_iter != format.parameters.end()) {
+    const auto ptime = rtc::StringToNumber<int>(ptime_iter->second);
+    if (ptime && *ptime > 0) {
+      config.frame_size_ms = rtc::SafeClamp(10 * (*ptime / 10), 10, 60);
+    }
+  }
   return STR_CASE_CMP(format.name.c_str(), "L16") == 0 && config.IsOk()
              ? absl::optional<Config>(config)
              : absl::nullopt;