This reverts commit 81c0cf287c8514cb1cd6f3baca484d668c6eb128. Reason for revert: internal test failures 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} TBR=gustaf@webrtc.org,peah@webrtc.org Change-Id: I2729e3ad24b3a9b40b368b84cb565c859e79b51e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10882 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150084 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Steve Anton <steveanton@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28931}
71 lines
1.7 KiB
C++
71 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2012 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/level_estimator_impl.h"
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
#include "api/array_view.h"
|
|
#include "modules/audio_processing/audio_buffer.h"
|
|
#include "modules/audio_processing/rms_level.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
LevelEstimatorImpl::LevelEstimatorImpl(rtc::CriticalSection* crit)
|
|
: crit_(crit), rms_(new RmsLevel()) {
|
|
RTC_DCHECK(crit);
|
|
}
|
|
|
|
LevelEstimatorImpl::~LevelEstimatorImpl() {}
|
|
|
|
void LevelEstimatorImpl::Initialize() {
|
|
rtc::CritScope cs(crit_);
|
|
rms_->Reset();
|
|
}
|
|
|
|
void LevelEstimatorImpl::ProcessStream(AudioBuffer* audio) {
|
|
RTC_DCHECK(audio);
|
|
rtc::CritScope cs(crit_);
|
|
if (!enabled_) {
|
|
return;
|
|
}
|
|
|
|
for (size_t i = 0; i < audio->num_channels(); i++) {
|
|
rms_->Analyze(rtc::ArrayView<const float>(audio->channels_const_f()[i],
|
|
audio->num_frames()));
|
|
}
|
|
}
|
|
|
|
int LevelEstimatorImpl::Enable(bool enable) {
|
|
rtc::CritScope cs(crit_);
|
|
if (enable && !enabled_) {
|
|
rms_->Reset();
|
|
}
|
|
enabled_ = enable;
|
|
return AudioProcessing::kNoError;
|
|
}
|
|
|
|
bool LevelEstimatorImpl::is_enabled() const {
|
|
rtc::CritScope cs(crit_);
|
|
return enabled_;
|
|
}
|
|
|
|
int LevelEstimatorImpl::RMS() {
|
|
rtc::CritScope cs(crit_);
|
|
if (!enabled_) {
|
|
return AudioProcessing::kNotEnabledError;
|
|
}
|
|
|
|
return rms_->Average();
|
|
}
|
|
} // namespace webrtc
|