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

Side by Side Diff: webrtc/modules/audio_processing/aec3/residual_echo_estimator.h

Issue 3003733002: Utilizing the AEC3 config struct for constants. (Closed)
Patch Set: Added comment Created 3 years, 3 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2017 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_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
13 13
14 #include <algorithm> 14 #include <algorithm>
15 #include <array> 15 #include <array>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/modules/audio_processing/aec3/aec3_common.h" 18 #include "webrtc/modules/audio_processing/aec3/aec3_common.h"
19 #include "webrtc/modules/audio_processing/aec3/aec_state.h" 19 #include "webrtc/modules/audio_processing/aec3/aec_state.h"
20 #include "webrtc/modules/audio_processing/aec3/render_buffer.h" 20 #include "webrtc/modules/audio_processing/aec3/render_buffer.h"
21 #include "webrtc/modules/audio_processing/include/audio_processing.h"
21 #include "webrtc/rtc_base/array_view.h" 22 #include "webrtc/rtc_base/array_view.h"
22 #include "webrtc/rtc_base/constructormagic.h" 23 #include "webrtc/rtc_base/constructormagic.h"
23 24
24 namespace webrtc { 25 namespace webrtc {
25 26
26 class ResidualEchoEstimator { 27 class ResidualEchoEstimator {
27 public: 28 public:
28 ResidualEchoEstimator(); 29 explicit ResidualEchoEstimator(
30 const AudioProcessing::Config::EchoCanceller3& config);
29 ~ResidualEchoEstimator(); 31 ~ResidualEchoEstimator();
30 32
31 void Estimate(bool using_subtractor_output, 33 void Estimate(bool using_subtractor_output,
32 const AecState& aec_state, 34 const AecState& aec_state,
33 const RenderBuffer& render_buffer, 35 const RenderBuffer& render_buffer,
34 const std::array<float, kFftLengthBy2Plus1>& S2_linear, 36 const std::array<float, kFftLengthBy2Plus1>& S2_linear,
35 const std::array<float, kFftLengthBy2Plus1>& Y2, 37 const std::array<float, kFftLengthBy2Plus1>& Y2,
36 std::array<float, kFftLengthBy2Plus1>* R2); 38 std::array<float, kFftLengthBy2Plus1>* R2);
37 39
38 private: 40 private:
(...skipping 23 matching lines...) Expand all
62 std::array<float, kFftLengthBy2Plus1>* R2); 64 std::array<float, kFftLengthBy2Plus1>* R2);
63 65
64 std::array<float, kFftLengthBy2Plus1> R2_old_; 66 std::array<float, kFftLengthBy2Plus1> R2_old_;
65 std::array<int, kFftLengthBy2Plus1> R2_hold_counter_; 67 std::array<int, kFftLengthBy2Plus1> R2_hold_counter_;
66 std::array<float, kFftLengthBy2Plus1> R2_reverb_; 68 std::array<float, kFftLengthBy2Plus1> R2_reverb_;
67 int S2_old_index_ = 0; 69 int S2_old_index_ = 0;
68 std::array<std::array<float, kFftLengthBy2Plus1>, kAdaptiveFilterLength> 70 std::array<std::array<float, kFftLengthBy2Plus1>, kAdaptiveFilterLength>
69 S2_old_; 71 S2_old_;
70 std::array<float, kFftLengthBy2Plus1> X2_noise_floor_; 72 std::array<float, kFftLengthBy2Plus1> X2_noise_floor_;
71 std::array<int, kFftLengthBy2Plus1> X2_noise_floor_counter_; 73 std::array<int, kFftLengthBy2Plus1> X2_noise_floor_counter_;
74 const AudioProcessing::Config::EchoCanceller3 config_;
72 75
73 RTC_DISALLOW_COPY_AND_ASSIGN(ResidualEchoEstimator); 76 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ResidualEchoEstimator);
74 }; 77 };
75 78
76 } // namespace webrtc 79 } // namespace webrtc
77 80
78 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ 81 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698