Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: webrtc/modules/audio_processing/noise_suppression_impl.h

Issue 1523323002: Fix NoiseSuppression initialization behavior. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/noise_suppression_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
13 13
14 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/criticalsection.h" 15 #include "webrtc/base/criticalsection.h"
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/audio_processing/include/audio_processing.h" 17 #include "webrtc/modules/audio_processing/include/audio_processing.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 class AudioBuffer; 21 class AudioBuffer;
22 22
23 class NoiseSuppressionImpl : public NoiseSuppression { 23 class NoiseSuppressionImpl : public NoiseSuppression {
24 public: 24 public:
25 explicit NoiseSuppressionImpl(rtc::CriticalSection* crit); 25 explicit NoiseSuppressionImpl(rtc::CriticalSection* crit);
26 ~NoiseSuppressionImpl() override; 26 ~NoiseSuppressionImpl() override;
27 27
28 // TODO(peah): Fold into ctor, once public API is removed. 28 // TODO(peah): Fold into ctor, once public API is removed.
29 void Initialize(int channels, int sample_rate_hz); 29 void Initialize(int channels, int sample_rate_hz);
30 int AnalyzeCaptureAudio(AudioBuffer* audio); 30 void AnalyzeCaptureAudio(AudioBuffer* audio);
31 int ProcessCaptureAudio(AudioBuffer* audio); 31 void ProcessCaptureAudio(AudioBuffer* audio);
32 32
33 // NoiseSuppression implementation. 33 // NoiseSuppression implementation.
34 int Enable(bool enable) override; 34 int Enable(bool enable) override;
35 bool is_enabled() const override; 35 bool is_enabled() const override;
36 int set_level(Level level) override; 36 int set_level(Level level) override;
37 Level level() const override; 37 Level level() const override;
38 float speech_probability() const override; 38 float speech_probability() const override;
39 39
40 private: 40 private:
41 class Suppressor; 41 class Suppressor;
42 rtc::CriticalSection* const crit_; 42 rtc::CriticalSection* const crit_;
43 bool enabled_ GUARDED_BY(crit_) = false; 43 bool enabled_ GUARDED_BY(crit_) = false;
44 Level level_ GUARDED_BY(crit_) = kModerate; 44 Level level_ GUARDED_BY(crit_) = kModerate;
45 int channels_ GUARDED_BY(crit_) = 0;
46 int sample_rate_hz_ GUARDED_BY(crit_) = 0;
45 std::vector<rtc::scoped_ptr<Suppressor>> suppressors_ GUARDED_BY(crit_); 47 std::vector<rtc::scoped_ptr<Suppressor>> suppressors_ GUARDED_BY(crit_);
46 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(NoiseSuppressionImpl); 48 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(NoiseSuppressionImpl);
47 }; 49 };
48 } // namespace webrtc 50 } // namespace webrtc
49 51
50 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_ 52 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/noise_suppression_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698