Chromium Code Reviews| Index: webrtc/modules/audio_processing/agc2/gain_controller2.h |
| diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2.h b/webrtc/modules/audio_processing/agc2/gain_controller2.h |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..bf3c791adb14e15cadb5c370a0ea55604c64411f |
| --- /dev/null |
| +++ b/webrtc/modules/audio_processing/agc2/gain_controller2.h |
| @@ -0,0 +1,57 @@ |
| +/* |
| + * Copyright (c) 2017 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 WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ |
| +#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ |
| + |
| +#include <memory> |
| +#include <string> |
| + |
| +#include "webrtc/base/constructormagic.h" |
| +#include "webrtc/modules/audio_processing/include/audio_processing.h" |
| +#include "webrtc/modules/audio_processing/level_controller/gain_applier.h" |
|
peah-webrtc
2017/05/16 13:06:58
I don't think we should reuse level_controller cod
AleBzk
2017/05/18 08:31:37
Thanks for this comment.
I wrote a new class named
peah-webrtc
2017/05/18 10:51:18
That sounds good.
|
| + |
| +namespace webrtc { |
| + |
| +class ApmDataDumper; |
| +class AudioBuffer; |
| + |
| +// Gain Controller 2 aims to automatically adjusting levels by acting on the |
| +// microphone gain and/or applying digital gain. It does not use the band split |
|
peah-webrtc
2017/05/16 13:06:57
I don't think you should mention the band-split no
AleBzk
2017/05/18 08:31:37
Done.
|
| +// filter, in order to avoid spectral leakage issues and unnecessary complexity. |
| +// Finally, it only provides the floating point interface. |
| +// |
| +// It temporarily implements a hard-coded gain mode only. |
| +class GainController2 { |
| + public: |
| + explicit GainController2(int sample_rate_hz); |
| + ~GainController2(); |
| + |
| + void Process(AudioBuffer* audio); |
| + |
| + static bool Validate(const AudioProcessing::Config::GainController2& config); |
| + static std::string ToString( |
| + const AudioProcessing::Config::GainController2& config); |
| + |
| + private: |
| + std::unique_ptr<ApmDataDumper> data_dumper_; |
| + GainApplier gain_applier_; |
| + static int instance_count_; |
| + |
| + // TODO(...): Remove once a meaningful gain controller mode is implemented. |
|
peah-webrtc
2017/05/16 13:06:58
You need to have a name for the todo.
AleBzk
2017/05/18 08:31:37
Done.
|
| + const float hard_coded_gain_; |
|
peah-webrtc
2017/05/16 13:06:57
fixed_gain_ sounds better. WDYT?
AleBzk
2017/05/18 08:31:37
I started with that naming, but I didn't want the
peah-webrtc
2017/05/18 10:51:18
Np :-) At this stage, anything is actually fine si
|
| + |
|
peah-webrtc
2017/05/16 13:06:58
Please remove duplicate empty line.
AleBzk
2017/05/18 08:31:37
Done.
|
| + |
| + RTC_DISALLOW_COPY_AND_ASSIGN(GainController2); |
| +}; |
| + |
| +} // namespace webrtc |
| + |
| +#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_GAIN_CONTROLLER2_H_ |