zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redesign of the render buffering in AEC3

Browse Source 
This CL centralizes the render buffering in AEC3 so that all render
buffers are updated and synchronized/aligned with the render alignment
buffer.

Bug: webrtc:8597, chromium:790905
Change-Id: I8a94e5c1f27316b6100b420eec9652ea31c1a91d
Reviewed-on: https://webrtc-review.googlesource.com/25680
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20989}
This commit is contained in:
Per Åhgren
2017-12-01 23:01:44 +01:00
committed by Commit Bot
parent f388803265
commit 8ba5861f7e
55 changed files with 1213 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
modules/audio_processing/aec3/render_buffer.h
View File

@ -11,12 +11,14 @@
#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
#include <array>
#include <memory>
#include <vector>
#include "api/array_view.h"
#include "modules/audio_processing/aec3/aec3_fft.h"
#include "modules/audio_processing/aec3/fft_buffer.h"
#include "modules/audio_processing/aec3/fft_data.h"
#include "modules/audio_processing/aec3/matrix_buffer.h"
#include "modules/audio_processing/aec3/vector_buffer.h"
#include "rtc_base/constructormagic.h"
namespace webrtc {
@ -24,55 +26,48 @@ namespace webrtc {
// Provides a buffer of the render data for the echo remover.
class RenderBuffer {
public:
// The constructor takes, besides from the other parameters, a vector
// containing the number of FFTs that will be included in the spectral sums in
// the call to SpectralSum.
RenderBuffer(Aec3Optimization optimization,
size_t num_bands,
size_t size,
const std::vector<size_t> num_ffts_for_spectral_sums);
RenderBuffer(size_t num_ffts_for_spectral_sums,
MatrixBuffer* block_buffer,
VectorBuffer* spectrum_buffer,
FftBuffer* fft_buffer);
~RenderBuffer();
// Clears the buffer.
void Clear();
// Insert a block into the buffer.
void Insert(const std::vector<std::vector<float>>& block);
void UpdateSpectralSum();
// Gets the last inserted block.
const std::vector<std::vector<float>>& MostRecentBlock() const {
return last_block_;
return block_buffer_->buffer[block_buffer_->read];
}
// Get the spectrum from one of the FFTs in the buffer
const std::array<float, kFftLengthBy2Plus1>& Spectrum(
size_t buffer_offset_ffts) const {
return spectrum_buffer_[(position_ + buffer_offset_ffts) %
fft_buffer_.size()];
// Get the spectrum from one of the FFTs in the buffer.
rtc::ArrayView<const float> Spectrum(size_t buffer_offset_ffts) const {
size_t position = spectrum_buffer_->OffsetIndex(spectrum_buffer_->read,
buffer_offset_ffts);
return spectrum_buffer_->buffer[position];
}
// Returns the sum of the spectrums for a certain number of FFTs.
const std::array<float, kFftLengthBy2Plus1>& SpectralSum(
size_t num_ffts) const {
rtc::ArrayView<const float> SpectralSum(size_t num_ffts) const {
RTC_DCHECK_EQ(spectral_sums_length_, num_ffts);
return spectral_sums_[0];
return spectral_sums_;
}
// Returns the circular buffer.
rtc::ArrayView<const FftData> Buffer() const { return fft_buffer_; }
rtc::ArrayView<const FftData> Buffer() const { return fft_buffer_->buffer; }
// Returns the current position in the circular buffer
size_t Position() const { return position_; }
// Returns the current position in the circular buffer.
size_t Position() const { return fft_buffer_->read; }
private:
const Aec3Optimization optimization_;
std::vector<FftData> fft_buffer_;
std::vector<std::array<float, kFftLengthBy2Plus1>> spectrum_buffer_;
size_t spectral_sums_length_;
std::vector<std::array<float, kFftLengthBy2Plus1>> spectral_sums_;
size_t position_ = 0;
std::vector<std::vector<float>> last_block_;
const Aec3Fft fft_;
const MatrixBuffer* const block_buffer_;
VectorBuffer* spectrum_buffer_;
const FftBuffer* const fft_buffer_;
const size_t spectral_sums_length_;
std::array<float, kFftLengthBy2Plus1> spectral_sums_;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderBuffer);
};