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

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

Issue 2784023002: Major AEC3 render pipeline changes (Closed)
Patch Set: Disabled one more DEATH test that caused issues due to bug on bots Created 3 years, 8 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_SUBTRACTOR_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
13 13
14 #include <array> 14 #include <array>
15 #include <algorithm> 15 #include <algorithm>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" 19 #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h"
20 #include "webrtc/modules/audio_processing/aec3/aec3_common.h" 20 #include "webrtc/modules/audio_processing/aec3/aec3_common.h"
21 #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" 21 #include "webrtc/modules/audio_processing/aec3/aec3_fft.h"
22 #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" 22 #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h"
23 #include "webrtc/modules/audio_processing/aec3/fft_buffer.h"
24 #include "webrtc/modules/audio_processing/aec3/main_filter_update_gain.h" 23 #include "webrtc/modules/audio_processing/aec3/main_filter_update_gain.h"
24 #include "webrtc/modules/audio_processing/aec3/render_buffer.h"
25 #include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" 25 #include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h"
26 #include "webrtc/modules/audio_processing/aec3/subtractor_output.h" 26 #include "webrtc/modules/audio_processing/aec3/subtractor_output.h"
27 #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" 27 #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
28 #include "webrtc/modules/audio_processing/utility/ooura_fft.h" 28 #include "webrtc/modules/audio_processing/utility/ooura_fft.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 // Proves linear echo cancellation functionality 32 // Proves linear echo cancellation functionality
33 class Subtractor { 33 class Subtractor {
34 public: 34 public:
35 Subtractor(ApmDataDumper* data_dumper, Aec3Optimization optimization); 35 Subtractor(ApmDataDumper* data_dumper, Aec3Optimization optimization);
36 ~Subtractor(); 36 ~Subtractor();
37 37
38 // Performs the echo subtraction. 38 // Performs the echo subtraction.
39 void Process(const FftBuffer& render_buffer, 39 void Process(const RenderBuffer& render_buffer,
40 const rtc::ArrayView<const float> capture, 40 const rtc::ArrayView<const float> capture,
41 const RenderSignalAnalyzer& render_signal_analyzer, 41 const RenderSignalAnalyzer& render_signal_analyzer,
42 bool saturation, 42 bool saturation,
43 SubtractorOutput* output); 43 SubtractorOutput* output);
44 44
45 // Returns a vector with the number of blocks included in the render buffer 45 // Returns a vector with the number of blocks included in the render buffer
46 // sums. 46 // sums.
47 std::vector<size_t> NumBlocksInRenderSums() const; 47 std::vector<size_t> NumBlocksInRenderSums() const;
48 48
49 // Returns the minimum required farend buffer length. 49 // Returns the minimum required farend buffer length.
(...skipping 20 matching lines...) Expand all
70 AdaptiveFirFilter shadow_filter_; 70 AdaptiveFirFilter shadow_filter_;
71 MainFilterUpdateGain G_main_; 71 MainFilterUpdateGain G_main_;
72 ShadowFilterUpdateGain G_shadow_; 72 ShadowFilterUpdateGain G_shadow_;
73 73
74 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Subtractor); 74 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Subtractor);
75 }; 75 };
76 76
77 } // namespace webrtc 77 } // namespace webrtc
78 78
79 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ 79 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698