mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
d3ead1a942
This change adds a Block class to reduce the need for std::vector<std::vector<std::vector<float>>>. This make the code easier to read and less error prone. It also enables future changes to the underlying data structure of a block. For instance, the data of all bands and channels could be stored in a single vector. The change has been verified to be bit-exact. Bug: webrtc:14089 Change-Id: Ied9a78124c0bbafe0e912017aef91f7c311de2ae Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262252 Reviewed-by: Per Åhgren <peah@webrtc.org> Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36968}
80 lines
2.9 KiB
C++
80 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2016 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 "modules/audio_processing/aec3/frame_blocker.h"
|
|
|
|
#include "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
FrameBlocker::FrameBlocker(size_t num_bands, size_t num_channels)
|
|
: num_bands_(num_bands),
|
|
num_channels_(num_channels),
|
|
buffer_(num_bands_, std::vector<std::vector<float>>(num_channels)) {
|
|
RTC_DCHECK_LT(0, num_bands);
|
|
RTC_DCHECK_LT(0, num_channels);
|
|
for (auto& band : buffer_) {
|
|
for (auto& channel : band) {
|
|
channel.reserve(kBlockSize);
|
|
RTC_DCHECK(channel.empty());
|
|
}
|
|
}
|
|
}
|
|
|
|
FrameBlocker::~FrameBlocker() = default;
|
|
|
|
void FrameBlocker::InsertSubFrameAndExtractBlock(
|
|
const std::vector<std::vector<rtc::ArrayView<float>>>& sub_frame,
|
|
Block* block) {
|
|
RTC_DCHECK(block);
|
|
RTC_DCHECK_EQ(num_bands_, block->NumBands());
|
|
RTC_DCHECK_EQ(num_bands_, sub_frame.size());
|
|
for (size_t band = 0; band < num_bands_; ++band) {
|
|
RTC_DCHECK_EQ(num_channels_, block->NumChannels());
|
|
RTC_DCHECK_EQ(num_channels_, sub_frame[band].size());
|
|
for (size_t channel = 0; channel < num_channels_; ++channel) {
|
|
RTC_DCHECK_GE(kBlockSize - 16, buffer_[band][channel].size());
|
|
RTC_DCHECK_EQ(kSubFrameLength, sub_frame[band][channel].size());
|
|
const int samples_to_block = kBlockSize - buffer_[band][channel].size();
|
|
std::copy(buffer_[band][channel].begin(), buffer_[band][channel].end(),
|
|
block->begin(band, channel));
|
|
std::copy(sub_frame[band][channel].begin(),
|
|
sub_frame[band][channel].begin() + samples_to_block,
|
|
block->begin(band, channel) + kBlockSize - samples_to_block);
|
|
buffer_[band][channel].clear();
|
|
buffer_[band][channel].insert(
|
|
buffer_[band][channel].begin(),
|
|
sub_frame[band][channel].begin() + samples_to_block,
|
|
sub_frame[band][channel].end());
|
|
}
|
|
}
|
|
}
|
|
|
|
bool FrameBlocker::IsBlockAvailable() const {
|
|
return kBlockSize == buffer_[0][0].size();
|
|
}
|
|
|
|
void FrameBlocker::ExtractBlock(Block* block) {
|
|
RTC_DCHECK(block);
|
|
RTC_DCHECK_EQ(num_bands_, block->NumBands());
|
|
RTC_DCHECK_EQ(num_channels_, block->NumChannels());
|
|
RTC_DCHECK(IsBlockAvailable());
|
|
for (size_t band = 0; band < num_bands_; ++band) {
|
|
for (size_t channel = 0; channel < num_channels_; ++channel) {
|
|
RTC_DCHECK_EQ(kBlockSize, buffer_[band][channel].size());
|
|
std::copy(buffer_[band][channel].begin(), buffer_[band][channel].end(),
|
|
block->begin(band, channel));
|
|
buffer_[band][channel].clear();
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|