82ec0faf72
When FixedGainController::SetGain() is called first on a large value (e.g., 40 dB) and afterwards on a smaller one (e.g., 0 dB), the limiter used by FixedGainController takes time (about 10-20 seconds) to converge. During that period, the audio is not audible and the volume slowly increases. Even if switching from 40 dB to 0 dB is unlikely, this behavior can be corrected by resetting the limiter every time that FixedGainController::SetGain() is called. This eliminates the undesired effect described above even when the transient is short. Bug: webrtc:7494 Change-Id: I419b8986d2181448b4671cdbbd1c256dfb460216 Reviewed-on: https://webrtc-review.googlesource.com/94902 Reviewed-by: Alex Loiko <aleloi@webrtc.org> Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24451}
62 lines
2.0 KiB
C++
62 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) 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.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_PROCESSING_AGC2_GAIN_CURVE_APPLIER_H_
|
|
#define MODULES_AUDIO_PROCESSING_AGC2_GAIN_CURVE_APPLIER_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
|
|
#include "modules/audio_processing/agc2/interpolated_gain_curve.h"
|
|
#include "modules/audio_processing/include/audio_frame_view.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
namespace webrtc {
|
|
class ApmDataDumper;
|
|
|
|
class GainCurveApplier {
|
|
public:
|
|
GainCurveApplier(size_t sample_rate_hz,
|
|
ApmDataDumper* apm_data_dumper,
|
|
std::string histogram_name_prefix);
|
|
|
|
~GainCurveApplier();
|
|
|
|
void Process(AudioFrameView<float> signal);
|
|
InterpolatedGainCurve::Stats GetGainCurveStats() const;
|
|
|
|
// Supported rates must be
|
|
// * supported by FixedDigitalLevelEstimator
|
|
// * below kMaximalNumberOfSamplesPerChannel*1000/kFrameDurationMs
|
|
// so that samples_per_channel fit in the
|
|
// per_sample_scaling_factors_ array.
|
|
void SetSampleRate(size_t sample_rate_hz);
|
|
|
|
// Resets the internal state.
|
|
void Reset();
|
|
|
|
private:
|
|
const InterpolatedGainCurve interp_gain_curve_;
|
|
FixedDigitalLevelEstimator level_estimator_;
|
|
ApmDataDumper* const apm_data_dumper_ = nullptr;
|
|
|
|
// Work array containing the sub-frame scaling factors to be interpolated.
|
|
std::array<float, kSubFramesInFrame + 1> scaling_factors_ = {};
|
|
std::array<float, kMaximalNumberOfSamplesPerChannel>
|
|
per_sample_scaling_factors_ = {};
|
|
float last_scaling_factor_ = 1.f;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(GainCurveApplier);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_AGC2_GAIN_CURVE_APPLIER_H_
|