mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
f254e9e9e5
This reverts commit 81c0cf287c.
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}
47 lines
1.4 KiB
C++
47 lines
1.4 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.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
|
|
#define MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "rtc_base/constructor_magic.h"
|
|
#include "rtc_base/critical_section.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioBuffer;
|
|
class RmsLevel;
|
|
|
|
class LevelEstimatorImpl : public LevelEstimator {
|
|
public:
|
|
explicit LevelEstimatorImpl(rtc::CriticalSection* crit);
|
|
~LevelEstimatorImpl() override;
|
|
|
|
// TODO(peah): Fold into ctor, once public API is removed.
|
|
void Initialize();
|
|
void ProcessStream(AudioBuffer* audio);
|
|
|
|
// LevelEstimator implementation.
|
|
int Enable(bool enable) override;
|
|
bool is_enabled() const override;
|
|
int RMS() override;
|
|
|
|
private:
|
|
rtc::CriticalSection* const crit_ = nullptr;
|
|
bool enabled_ RTC_GUARDED_BY(crit_) = false;
|
|
std::unique_ptr<RmsLevel> rms_ RTC_GUARDED_BY(crit_);
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LevelEstimatorImpl);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
|