2017-08-16 06:12:57 -07:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/audio_codecs/L16/audio_encoder_L16.h"
|
2017-08-16 06:12:57 -07:00
|
|
|
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
#include "absl/memory/memory.h"
|
2017-09-15 13:58:09 +02:00
|
|
|
#include "common_types.h" // NOLINT(build/include)
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
|
|
|
|
|
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
|
2017-11-22 10:42:26 +01:00
|
|
|
#include "rtc_base/numerics/safe_conversions.h"
|
2018-07-06 15:40:14 +02:00
|
|
|
#include "rtc_base/numerics/safe_minmax.h"
|
|
|
|
|
#include "rtc_base/string_to_number.h"
|
2017-08-16 06:12:57 -07:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2018-06-21 13:32:56 +02:00
|
|
|
absl::optional<AudioEncoderL16::Config> AudioEncoderL16::SdpToConfig(
|
2017-08-16 06:12:57 -07:00
|
|
|
const SdpAudioFormat& format) {
|
2017-09-14 13:49:13 +02:00
|
|
|
if (!rtc::IsValueInRangeForNumericType<int>(format.num_channels)) {
|
2018-06-21 13:32:56 +02:00
|
|
|
return absl::nullopt;
|
2017-09-14 13:49:13 +02:00
|
|
|
}
|
2017-08-16 06:12:57 -07:00
|
|
|
Config config;
|
|
|
|
|
config.sample_rate_hz = format.clockrate_hz;
|
2017-09-14 13:49:13 +02:00
|
|
|
config.num_channels = rtc::dchecked_cast<int>(format.num_channels);
|
2018-07-06 15:40:14 +02:00
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-08-16 06:12:57 -07:00
|
|
|
return STR_CASE_CMP(format.name.c_str(), "L16") == 0 && config.IsOk()
|
2018-06-21 13:32:56 +02:00
|
|
|
? absl::optional<Config>(config)
|
|
|
|
|
: absl::nullopt;
|
2017-08-16 06:12:57 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AudioEncoderL16::AppendSupportedEncoders(
|
|
|
|
|
std::vector<AudioCodecSpec>* specs) {
|
|
|
|
|
Pcm16BAppendSupportedCodecSpecs(specs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AudioCodecInfo AudioEncoderL16::QueryAudioEncoder(
|
|
|
|
|
const AudioEncoderL16::Config& config) {
|
|
|
|
|
RTC_DCHECK(config.IsOk());
|
|
|
|
|
return {config.sample_rate_hz,
|
|
|
|
|
rtc::dchecked_cast<size_t>(config.num_channels),
|
|
|
|
|
config.sample_rate_hz * config.num_channels * 16};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<AudioEncoder> AudioEncoderL16::MakeAudioEncoder(
|
|
|
|
|
const AudioEncoderL16::Config& config,
|
2018-03-01 15:13:27 +01:00
|
|
|
int payload_type,
|
2018-06-21 13:32:56 +02:00
|
|
|
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
|
2017-08-16 06:12:57 -07:00
|
|
|
RTC_DCHECK(config.IsOk());
|
|
|
|
|
AudioEncoderPcm16B::Config c;
|
|
|
|
|
c.sample_rate_hz = config.sample_rate_hz;
|
|
|
|
|
c.num_channels = config.num_channels;
|
|
|
|
|
c.frame_size_ms = config.frame_size_ms;
|
|
|
|
|
c.payload_type = payload_type;
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
return absl::make_unique<AudioEncoderPcm16B>(c);
|
2017-08-16 06:12:57 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|