d6ef33e59b
This switches from accepting a sample rate and convert to channel size over to accepting the channel size. Instead of InitializeIfNeeded: * Offer a way to explicitly initialize PushResampler via the ctor (needed for VoiceActivityDetectorWrapper) * Implicitly check for the right configuration from within Resample(). (All calls to Resample() were preceded by a call to Initialize) As part of this, refactor VoiceActivityDetectorWrapper (VADW): * VADW is now initialized in the constructor and more const. * Remove VADW::Initialize() and instead reconstruct VADW if needed. Add constants for max sample rate and num channels to audio_util.h In many cases the numbers for these values are embedded in the code which has led to some inconsistency. Bug: chromium:335805780 Change-Id: Iead0d52eb1b261a8d64e93f51401147c8fba32f0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/353360 Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42587}
128 lines
4.6 KiB
C++
128 lines
4.6 KiB
C++
/*
|
|
* Copyright (c) 2013 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 "common_audio/resampler/include/push_resampler.h"
|
|
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "api/audio/audio_frame.h"
|
|
#include "common_audio/include/audio_util.h"
|
|
#include "common_audio/resampler/push_sinc_resampler.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
// Maximum concurrent number of channels for `PushResampler<>`.
|
|
// Note that this may be different from what the maximum is for audio codecs.
|
|
constexpr int kMaxNumberOfChannels = 8;
|
|
} // namespace
|
|
|
|
template <typename T>
|
|
PushResampler<T>::PushResampler() = default;
|
|
|
|
template <typename T>
|
|
PushResampler<T>::PushResampler(size_t src_samples_per_channel,
|
|
size_t dst_samples_per_channel,
|
|
size_t num_channels) {
|
|
EnsureInitialized(src_samples_per_channel, dst_samples_per_channel,
|
|
num_channels);
|
|
}
|
|
|
|
template <typename T>
|
|
PushResampler<T>::~PushResampler() = default;
|
|
|
|
template <typename T>
|
|
void PushResampler<T>::EnsureInitialized(size_t src_samples_per_channel,
|
|
size_t dst_samples_per_channel,
|
|
size_t num_channels) {
|
|
RTC_DCHECK_GT(src_samples_per_channel, 0);
|
|
RTC_DCHECK_GT(dst_samples_per_channel, 0);
|
|
RTC_DCHECK_GT(num_channels, 0);
|
|
RTC_DCHECK_LE(src_samples_per_channel, kMaxSamplesPerChannel10ms);
|
|
RTC_DCHECK_LE(dst_samples_per_channel, kMaxSamplesPerChannel10ms);
|
|
RTC_DCHECK_LE(num_channels, kMaxNumberOfChannels);
|
|
|
|
if (src_samples_per_channel == SamplesPerChannel(source_view_) &&
|
|
dst_samples_per_channel == SamplesPerChannel(destination_view_) &&
|
|
num_channels == NumChannels(source_view_)) {
|
|
// No-op if settings haven't changed.
|
|
return;
|
|
}
|
|
|
|
// Allocate two buffers for all source and destination channels.
|
|
// Then organize source and destination views together with an array of
|
|
// resamplers for each channel in the deinterlaved buffers.
|
|
source_.reset(new T[src_samples_per_channel * num_channels]);
|
|
destination_.reset(new T[dst_samples_per_channel * num_channels]);
|
|
source_view_ = DeinterleavedView<T>(source_.get(), src_samples_per_channel,
|
|
num_channels);
|
|
destination_view_ = DeinterleavedView<T>(
|
|
destination_.get(), dst_samples_per_channel, num_channels);
|
|
resamplers_.resize(num_channels);
|
|
for (size_t i = 0; i < num_channels; ++i) {
|
|
resamplers_[i] = std::make_unique<PushSincResampler>(
|
|
src_samples_per_channel, dst_samples_per_channel);
|
|
}
|
|
}
|
|
|
|
template <typename T>
|
|
int PushResampler<T>::Resample(InterleavedView<const T> src,
|
|
InterleavedView<T> dst) {
|
|
EnsureInitialized(SamplesPerChannel(src), SamplesPerChannel(dst),
|
|
NumChannels(src));
|
|
|
|
RTC_DCHECK_EQ(NumChannels(src), NumChannels(source_view_));
|
|
RTC_DCHECK_EQ(NumChannels(dst), NumChannels(destination_view_));
|
|
RTC_DCHECK_EQ(SamplesPerChannel(src), SamplesPerChannel(source_view_));
|
|
RTC_DCHECK_EQ(SamplesPerChannel(dst), SamplesPerChannel(destination_view_));
|
|
|
|
if (SamplesPerChannel(src) == SamplesPerChannel(dst)) {
|
|
// The old resampler provides this memcpy facility in the case of matching
|
|
// sample rates, so reproduce it here for the sinc resampler.
|
|
CopySamples(dst, src);
|
|
return static_cast<int>(src.data().size());
|
|
}
|
|
|
|
Deinterleave(src, source_view_);
|
|
|
|
for (size_t i = 0; i < resamplers_.size(); ++i) {
|
|
size_t dst_length_mono =
|
|
resamplers_[i]->Resample(source_view_[i], destination_view_[i]);
|
|
RTC_DCHECK_EQ(dst_length_mono, SamplesPerChannel(dst));
|
|
}
|
|
|
|
Interleave<T>(destination_view_, dst);
|
|
return static_cast<int>(dst.size());
|
|
}
|
|
|
|
template <typename T>
|
|
int PushResampler<T>::Resample(MonoView<const T> src, MonoView<T> dst) {
|
|
RTC_DCHECK_EQ(resamplers_.size(), 1);
|
|
RTC_DCHECK_EQ(SamplesPerChannel(src), SamplesPerChannel(source_view_));
|
|
RTC_DCHECK_EQ(SamplesPerChannel(dst), SamplesPerChannel(destination_view_));
|
|
|
|
if (SamplesPerChannel(src) == SamplesPerChannel(dst)) {
|
|
CopySamples(dst, src);
|
|
return static_cast<int>(src.size());
|
|
}
|
|
|
|
return resamplers_[0]->Resample(src, dst);
|
|
}
|
|
|
|
// Explictly generate required instantiations.
|
|
template class PushResampler<int16_t>;
|
|
template class PushResampler<float>;
|
|
|
|
} // namespace webrtc
|