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}
52 lines
2.0 KiB
C++
52 lines
2.0 KiB
C++
/*
|
|
* Copyright 2018 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/include/audio_frame_view.h"
|
|
|
|
#include "modules/audio_processing/audio_buffer.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
TEST(AudioFrameTest, ConstructFromAudioBuffer) {
|
|
constexpr int kSampleRateHz = 48000;
|
|
constexpr int kNumChannels = 2;
|
|
constexpr float kFloatConstant = 1272.f;
|
|
constexpr float kIntConstant = 17252;
|
|
const webrtc::StreamConfig stream_config(kSampleRateHz, kNumChannels, false);
|
|
webrtc::AudioBuffer buffer(
|
|
stream_config.sample_rate_hz(), stream_config.num_channels(),
|
|
stream_config.sample_rate_hz(), stream_config.num_channels(),
|
|
stream_config.sample_rate_hz(), stream_config.num_channels());
|
|
|
|
AudioFrameView<float> non_const_view(buffer.channels(), buffer.num_channels(),
|
|
buffer.num_frames());
|
|
// Modification is allowed.
|
|
non_const_view.channel(0)[0] = kFloatConstant;
|
|
EXPECT_EQ(buffer.channels()[0][0], kFloatConstant);
|
|
|
|
AudioFrameView<const float> const_view(
|
|
buffer.channels(), buffer.num_channels(), buffer.num_frames());
|
|
// Modification is not allowed.
|
|
// const_view.channel(0)[0] = kFloatConstant;
|
|
|
|
// Assignment is allowed.
|
|
AudioFrameView<const float> other_const_view = non_const_view;
|
|
static_cast<void>(other_const_view);
|
|
|
|
// But not the other way. The following will fail:
|
|
// non_const_view = other_const_view;
|
|
|
|
AudioFrameView<float> non_const_float_view(
|
|
buffer.channels(), buffer.num_channels(), buffer.num_frames());
|
|
non_const_float_view.channel(0)[0] = kIntConstant;
|
|
EXPECT_EQ(buffer.channels()[0][0], kIntConstant);
|
|
}
|
|
} // namespace webrtc
|