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

Side by Side Diff: webrtc/media/base/mediachannel.h

Issue 2493753002: Add AudioOption for residual echo detector, and enable it by default on non-mobile platforms. (Closed)
Patch Set: Removed mediaconstraint. Created 4 years, 1 month 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/media/engine/webrtcvoiceengine.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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 change.audio_jitter_buffer_fast_accelerate); 151 change.audio_jitter_buffer_fast_accelerate);
152 SetFrom(&typing_detection, change.typing_detection); 152 SetFrom(&typing_detection, change.typing_detection);
153 SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise); 153 SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise);
154 SetFrom(&adjust_agc_delta, change.adjust_agc_delta); 154 SetFrom(&adjust_agc_delta, change.adjust_agc_delta);
155 SetFrom(&experimental_agc, change.experimental_agc); 155 SetFrom(&experimental_agc, change.experimental_agc);
156 SetFrom(&extended_filter_aec, change.extended_filter_aec); 156 SetFrom(&extended_filter_aec, change.extended_filter_aec);
157 SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec); 157 SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec);
158 SetFrom(&experimental_ns, change.experimental_ns); 158 SetFrom(&experimental_ns, change.experimental_ns);
159 SetFrom(&intelligibility_enhancer, change.intelligibility_enhancer); 159 SetFrom(&intelligibility_enhancer, change.intelligibility_enhancer);
160 SetFrom(&level_control, change.level_control); 160 SetFrom(&level_control, change.level_control);
161 SetFrom(&residual_echo_detector, change.residual_echo_detector);
161 SetFrom(&tx_agc_target_dbov, change.tx_agc_target_dbov); 162 SetFrom(&tx_agc_target_dbov, change.tx_agc_target_dbov);
162 SetFrom(&tx_agc_digital_compression_gain, 163 SetFrom(&tx_agc_digital_compression_gain,
163 change.tx_agc_digital_compression_gain); 164 change.tx_agc_digital_compression_gain);
164 SetFrom(&tx_agc_limiter, change.tx_agc_limiter); 165 SetFrom(&tx_agc_limiter, change.tx_agc_limiter);
165 SetFrom(&recording_sample_rate, change.recording_sample_rate); 166 SetFrom(&recording_sample_rate, change.recording_sample_rate);
166 SetFrom(&playout_sample_rate, change.playout_sample_rate); 167 SetFrom(&playout_sample_rate, change.playout_sample_rate);
167 SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe); 168 SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe);
168 SetFrom(&audio_network_adaptor, change.audio_network_adaptor); 169 SetFrom(&audio_network_adaptor, change.audio_network_adaptor);
169 SetFrom(&audio_network_adaptor_config, change.audio_network_adaptor_config); 170 SetFrom(&audio_network_adaptor_config, change.audio_network_adaptor_config);
170 SetFrom(&level_control_initial_peak_level_dbfs, 171 SetFrom(&level_control_initial_peak_level_dbfs,
(...skipping 11 matching lines...) Expand all
182 audio_jitter_buffer_fast_accelerate == 183 audio_jitter_buffer_fast_accelerate ==
183 o.audio_jitter_buffer_fast_accelerate && 184 o.audio_jitter_buffer_fast_accelerate &&
184 typing_detection == o.typing_detection && 185 typing_detection == o.typing_detection &&
185 aecm_generate_comfort_noise == o.aecm_generate_comfort_noise && 186 aecm_generate_comfort_noise == o.aecm_generate_comfort_noise &&
186 experimental_agc == o.experimental_agc && 187 experimental_agc == o.experimental_agc &&
187 extended_filter_aec == o.extended_filter_aec && 188 extended_filter_aec == o.extended_filter_aec &&
188 delay_agnostic_aec == o.delay_agnostic_aec && 189 delay_agnostic_aec == o.delay_agnostic_aec &&
189 experimental_ns == o.experimental_ns && 190 experimental_ns == o.experimental_ns &&
190 intelligibility_enhancer == o.intelligibility_enhancer && 191 intelligibility_enhancer == o.intelligibility_enhancer &&
191 level_control == o.level_control && 192 level_control == o.level_control &&
193 residual_echo_detector == o.residual_echo_detector &&
192 adjust_agc_delta == o.adjust_agc_delta && 194 adjust_agc_delta == o.adjust_agc_delta &&
193 tx_agc_target_dbov == o.tx_agc_target_dbov && 195 tx_agc_target_dbov == o.tx_agc_target_dbov &&
194 tx_agc_digital_compression_gain == 196 tx_agc_digital_compression_gain ==
195 o.tx_agc_digital_compression_gain && 197 o.tx_agc_digital_compression_gain &&
196 tx_agc_limiter == o.tx_agc_limiter && 198 tx_agc_limiter == o.tx_agc_limiter &&
197 recording_sample_rate == o.recording_sample_rate && 199 recording_sample_rate == o.recording_sample_rate &&
198 playout_sample_rate == o.playout_sample_rate && 200 playout_sample_rate == o.playout_sample_rate &&
199 combined_audio_video_bwe == o.combined_audio_video_bwe && 201 combined_audio_video_bwe == o.combined_audio_video_bwe &&
200 audio_network_adaptor == o.audio_network_adaptor && 202 audio_network_adaptor == o.audio_network_adaptor &&
201 audio_network_adaptor_config == o.audio_network_adaptor_config && 203 audio_network_adaptor_config == o.audio_network_adaptor_config &&
(...skipping 18 matching lines...) Expand all
220 ost << ToStringIfSet("comfort_noise", aecm_generate_comfort_noise); 222 ost << ToStringIfSet("comfort_noise", aecm_generate_comfort_noise);
221 ost << ToStringIfSet("agc_delta", adjust_agc_delta); 223 ost << ToStringIfSet("agc_delta", adjust_agc_delta);
222 ost << ToStringIfSet("experimental_agc", experimental_agc); 224 ost << ToStringIfSet("experimental_agc", experimental_agc);
223 ost << ToStringIfSet("extended_filter_aec", extended_filter_aec); 225 ost << ToStringIfSet("extended_filter_aec", extended_filter_aec);
224 ost << ToStringIfSet("delay_agnostic_aec", delay_agnostic_aec); 226 ost << ToStringIfSet("delay_agnostic_aec", delay_agnostic_aec);
225 ost << ToStringIfSet("experimental_ns", experimental_ns); 227 ost << ToStringIfSet("experimental_ns", experimental_ns);
226 ost << ToStringIfSet("intelligibility_enhancer", intelligibility_enhancer); 228 ost << ToStringIfSet("intelligibility_enhancer", intelligibility_enhancer);
227 ost << ToStringIfSet("level_control", level_control); 229 ost << ToStringIfSet("level_control", level_control);
228 ost << ToStringIfSet("level_control_initial_peak_level_dbfs", 230 ost << ToStringIfSet("level_control_initial_peak_level_dbfs",
229 level_control_initial_peak_level_dbfs); 231 level_control_initial_peak_level_dbfs);
232 ost << ToStringIfSet("residual_echo_detector", residual_echo_detector);
230 ost << ToStringIfSet("tx_agc_target_dbov", tx_agc_target_dbov); 233 ost << ToStringIfSet("tx_agc_target_dbov", tx_agc_target_dbov);
231 ost << ToStringIfSet("tx_agc_digital_compression_gain", 234 ost << ToStringIfSet("tx_agc_digital_compression_gain",
232 tx_agc_digital_compression_gain); 235 tx_agc_digital_compression_gain);
233 ost << ToStringIfSet("tx_agc_limiter", tx_agc_limiter); 236 ost << ToStringIfSet("tx_agc_limiter", tx_agc_limiter);
234 ost << ToStringIfSet("recording_sample_rate", recording_sample_rate); 237 ost << ToStringIfSet("recording_sample_rate", recording_sample_rate);
235 ost << ToStringIfSet("playout_sample_rate", playout_sample_rate); 238 ost << ToStringIfSet("playout_sample_rate", playout_sample_rate);
236 ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe); 239 ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe);
237 ost << ToStringIfSet("audio_network_adaptor", audio_network_adaptor); 240 ost << ToStringIfSet("audio_network_adaptor", audio_network_adaptor);
238 // The adaptor config is a serialized proto buffer and therefore not human 241 // The adaptor config is a serialized proto buffer and therefore not human
239 // readable. So we comment out the following line. 242 // readable. So we comment out the following line.
(...skipping 24 matching lines...) Expand all
264 rtc::Optional<int> adjust_agc_delta; 267 rtc::Optional<int> adjust_agc_delta;
265 rtc::Optional<bool> experimental_agc; 268 rtc::Optional<bool> experimental_agc;
266 rtc::Optional<bool> extended_filter_aec; 269 rtc::Optional<bool> extended_filter_aec;
267 rtc::Optional<bool> delay_agnostic_aec; 270 rtc::Optional<bool> delay_agnostic_aec;
268 rtc::Optional<bool> experimental_ns; 271 rtc::Optional<bool> experimental_ns;
269 rtc::Optional<bool> intelligibility_enhancer; 272 rtc::Optional<bool> intelligibility_enhancer;
270 rtc::Optional<bool> level_control; 273 rtc::Optional<bool> level_control;
271 // Specifies an optional initialization value for the level controller. 274 // Specifies an optional initialization value for the level controller.
272 rtc::Optional<float> level_control_initial_peak_level_dbfs; 275 rtc::Optional<float> level_control_initial_peak_level_dbfs;
273 // Note that tx_agc_* only applies to non-experimental AGC. 276 // Note that tx_agc_* only applies to non-experimental AGC.
277 rtc::Optional<bool> residual_echo_detector;
274 rtc::Optional<uint16_t> tx_agc_target_dbov; 278 rtc::Optional<uint16_t> tx_agc_target_dbov;
275 rtc::Optional<uint16_t> tx_agc_digital_compression_gain; 279 rtc::Optional<uint16_t> tx_agc_digital_compression_gain;
276 rtc::Optional<bool> tx_agc_limiter; 280 rtc::Optional<bool> tx_agc_limiter;
277 rtc::Optional<uint32_t> recording_sample_rate; 281 rtc::Optional<uint32_t> recording_sample_rate;
278 rtc::Optional<uint32_t> playout_sample_rate; 282 rtc::Optional<uint32_t> playout_sample_rate;
279 // Enable combined audio+bandwidth BWE. 283 // Enable combined audio+bandwidth BWE.
280 // TODO(pthatcher): This flag is set from the 284 // TODO(pthatcher): This flag is set from the
281 // "googCombinedAudioVideoBwe", but not used anywhere. So delete it, 285 // "googCombinedAudioVideoBwe", but not used anywhere. So delete it,
282 // and check if any other AudioOptions members are unused. 286 // and check if any other AudioOptions members are unused.
283 rtc::Optional<bool> combined_audio_video_bwe; 287 rtc::Optional<bool> combined_audio_video_bwe;
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 // Signal when the media channel is ready to send the stream. Arguments are: 1165 // Signal when the media channel is ready to send the stream. Arguments are:
1162 // writable(bool) 1166 // writable(bool)
1163 sigslot::signal1<bool> SignalReadyToSend; 1167 sigslot::signal1<bool> SignalReadyToSend;
1164 // Signal for notifying that the remote side has closed the DataChannel. 1168 // Signal for notifying that the remote side has closed the DataChannel.
1165 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1169 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1166 }; 1170 };
1167 1171
1168 } // namespace cricket 1172 } // namespace cricket
1169 1173
1170 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ 1174 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698