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

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

Issue 1887003002: Added support in the AEC for refined filter adaptation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Corrected the issue with the missing const specifier in the header file Created 4 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) 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
(...skipping 29 matching lines...) Expand all
40 bool is_drift_compensation_enabled() const override; 40 bool is_drift_compensation_enabled() const override;
41 41
42 void Initialize(int sample_rate_hz, 42 void Initialize(int sample_rate_hz,
43 size_t num_reverse_channels_, 43 size_t num_reverse_channels_,
44 size_t num_output_channels_, 44 size_t num_output_channels_,
45 size_t num_proc_channels_); 45 size_t num_proc_channels_);
46 void SetExtraOptions(const Config& config); 46 void SetExtraOptions(const Config& config);
47 bool is_delay_agnostic_enabled() const; 47 bool is_delay_agnostic_enabled() const;
48 bool is_extended_filter_enabled() const; 48 bool is_extended_filter_enabled() const;
49 bool is_aec3_enabled() const; 49 bool is_aec3_enabled() const;
50 bool is_refined_adaptive_filter_enabled() const;
50 51
51 // Checks whether the module is enabled. Must only be 52 // Checks whether the module is enabled. Must only be
52 // called from the render side of APM as otherwise 53 // called from the render side of APM as otherwise
53 // deadlocks may occur. 54 // deadlocks may occur.
54 bool is_enabled_render_side_query() const; 55 bool is_enabled_render_side_query() const;
55 56
56 // Reads render side data that has been queued on the render call. 57 // Reads render side data that has been queued on the render call.
57 // Called holding the capture lock. 58 // Called holding the capture lock.
58 void ReadQueuedRenderData(); 59 void ReadQueuedRenderData();
59 60
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 bool drift_compensation_enabled_ GUARDED_BY(crit_capture_); 95 bool drift_compensation_enabled_ GUARDED_BY(crit_capture_);
95 bool metrics_enabled_ GUARDED_BY(crit_capture_); 96 bool metrics_enabled_ GUARDED_BY(crit_capture_);
96 SuppressionLevel suppression_level_ GUARDED_BY(crit_capture_); 97 SuppressionLevel suppression_level_ GUARDED_BY(crit_capture_);
97 int stream_drift_samples_ GUARDED_BY(crit_capture_); 98 int stream_drift_samples_ GUARDED_BY(crit_capture_);
98 bool was_stream_drift_set_ GUARDED_BY(crit_capture_); 99 bool was_stream_drift_set_ GUARDED_BY(crit_capture_);
99 bool stream_has_echo_ GUARDED_BY(crit_capture_); 100 bool stream_has_echo_ GUARDED_BY(crit_capture_);
100 bool delay_logging_enabled_ GUARDED_BY(crit_capture_); 101 bool delay_logging_enabled_ GUARDED_BY(crit_capture_);
101 bool extended_filter_enabled_ GUARDED_BY(crit_capture_); 102 bool extended_filter_enabled_ GUARDED_BY(crit_capture_);
102 bool delay_agnostic_enabled_ GUARDED_BY(crit_capture_); 103 bool delay_agnostic_enabled_ GUARDED_BY(crit_capture_);
103 bool aec3_enabled_ GUARDED_BY(crit_capture_); 104 bool aec3_enabled_ GUARDED_BY(crit_capture_);
105 bool refined_adaptive_filter_enabled_ GUARDED_BY(crit_capture_) = false;
104 106
105 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_) 107 size_t render_queue_element_max_size_ GUARDED_BY(crit_render_)
106 GUARDED_BY(crit_capture_); 108 GUARDED_BY(crit_capture_);
107 std::vector<float> render_queue_buffer_ GUARDED_BY(crit_render_); 109 std::vector<float> render_queue_buffer_ GUARDED_BY(crit_render_);
108 std::vector<float> capture_queue_buffer_ GUARDED_BY(crit_capture_); 110 std::vector<float> capture_queue_buffer_ GUARDED_BY(crit_capture_);
109 111
110 // Lock protection not needed. 112 // Lock protection not needed.
111 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>> 113 std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>>
112 render_signal_queue_; 114 render_signal_queue_;
113 115
114 std::vector<std::unique_ptr<Canceller>> cancellers_; 116 std::vector<std::unique_ptr<Canceller>> cancellers_;
115 std::unique_ptr<StreamProperties> stream_properties_; 117 std::unique_ptr<StreamProperties> stream_properties_;
116 118
117 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCancellationImpl); 119 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCancellationImpl);
118 }; 120 };
119 121
120 } // namespace webrtc 122 } // namespace webrtc
121 123
122 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ 124 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698