d47941e018
This is a reland of 81c0cf287c8514cb1cd6f3baca484d668c6eb128 Original change's description: > Simplification and refactoring of the AudioBuffer code > > This CL performs a major refactoring and simplification > of the AudioBuffer code that. > -Removes 7 of the 9 internal buffers of the AudioBuffer. > -Avoids the implicit copying required to keep the > internal buffers in sync. > -Removes all code relating to handling of fixed-point > sample data in the AudioBuffer. > -Changes the naming of the class methods to reflect > that only floating point is handled. > -Corrects some bugs in the code. > -Extends the handling of internal downmixing to be > more generic. > > Bug: webrtc:10882 > Change-Id: I12c8af156fbe366b154744a0a1b3d926bf7be572 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149828 > Commit-Queue: Per Åhgren <peah@webrtc.org> > Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#28928} Bug: webrtc:10882 Change-Id: I2ddf327e80a03468c41662ae63c619ff34f2363a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150101 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28938}
87 lines
3.5 KiB
C++
87 lines
3.5 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/test/simulator_buffers.h"
|
|
|
|
#include "modules/audio_processing/test/audio_buffer_tools.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
SimulatorBuffers::SimulatorBuffers(int render_input_sample_rate_hz,
|
|
int capture_input_sample_rate_hz,
|
|
int render_output_sample_rate_hz,
|
|
int capture_output_sample_rate_hz,
|
|
size_t num_render_input_channels,
|
|
size_t num_capture_input_channels,
|
|
size_t num_render_output_channels,
|
|
size_t num_capture_output_channels) {
|
|
Random rand_gen(42);
|
|
CreateConfigAndBuffer(render_input_sample_rate_hz, num_render_input_channels,
|
|
&rand_gen, &render_input_buffer, &render_input_config,
|
|
&render_input, &render_input_samples);
|
|
|
|
CreateConfigAndBuffer(render_output_sample_rate_hz,
|
|
num_render_output_channels, &rand_gen,
|
|
&render_output_buffer, &render_output_config,
|
|
&render_output, &render_output_samples);
|
|
|
|
CreateConfigAndBuffer(capture_input_sample_rate_hz,
|
|
num_capture_input_channels, &rand_gen,
|
|
&capture_input_buffer, &capture_input_config,
|
|
&capture_input, &capture_input_samples);
|
|
|
|
CreateConfigAndBuffer(capture_output_sample_rate_hz,
|
|
num_capture_output_channels, &rand_gen,
|
|
&capture_output_buffer, &capture_output_config,
|
|
&capture_output, &capture_output_samples);
|
|
|
|
UpdateInputBuffers();
|
|
}
|
|
|
|
SimulatorBuffers::~SimulatorBuffers() = default;
|
|
|
|
void SimulatorBuffers::CreateConfigAndBuffer(
|
|
int sample_rate_hz,
|
|
size_t num_channels,
|
|
Random* rand_gen,
|
|
std::unique_ptr<AudioBuffer>* buffer,
|
|
StreamConfig* config,
|
|
std::vector<float*>* buffer_data,
|
|
std::vector<float>* buffer_data_samples) {
|
|
int samples_per_channel = rtc::CheckedDivExact(sample_rate_hz, 100);
|
|
*config = StreamConfig(sample_rate_hz, num_channels, false);
|
|
buffer->reset(
|
|
new AudioBuffer(config->sample_rate_hz(), config->num_channels(),
|
|
config->sample_rate_hz(), config->num_channels(),
|
|
config->sample_rate_hz(), config->num_channels()));
|
|
|
|
buffer_data_samples->resize(samples_per_channel * num_channels);
|
|
for (auto& v : *buffer_data_samples) {
|
|
v = rand_gen->Rand<float>();
|
|
}
|
|
|
|
buffer_data->resize(num_channels);
|
|
for (size_t ch = 0; ch < num_channels; ++ch) {
|
|
(*buffer_data)[ch] = &(*buffer_data_samples)[ch * samples_per_channel];
|
|
}
|
|
}
|
|
|
|
void SimulatorBuffers::UpdateInputBuffers() {
|
|
test::CopyVectorToAudioBuffer(capture_input_config, capture_input_samples,
|
|
capture_input_buffer.get());
|
|
test::CopyVectorToAudioBuffer(render_input_config, render_input_samples,
|
|
render_input_buffer.get());
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|