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

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

Issue 1952123003: Surface the IntelligibilityEnhancer on MediaConstraints (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Change to use MediaConstraints Created 4 years, 7 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) 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 change.audio_jitter_buffer_max_packets); 150 change.audio_jitter_buffer_max_packets);
151 SetFrom(&audio_jitter_buffer_fast_accelerate, 151 SetFrom(&audio_jitter_buffer_fast_accelerate,
152 change.audio_jitter_buffer_fast_accelerate); 152 change.audio_jitter_buffer_fast_accelerate);
153 SetFrom(&typing_detection, change.typing_detection); 153 SetFrom(&typing_detection, change.typing_detection);
154 SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise); 154 SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise);
155 SetFrom(&adjust_agc_delta, change.adjust_agc_delta); 155 SetFrom(&adjust_agc_delta, change.adjust_agc_delta);
156 SetFrom(&experimental_agc, change.experimental_agc); 156 SetFrom(&experimental_agc, change.experimental_agc);
157 SetFrom(&extended_filter_aec, change.extended_filter_aec); 157 SetFrom(&extended_filter_aec, change.extended_filter_aec);
158 SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec); 158 SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec);
159 SetFrom(&experimental_ns, change.experimental_ns); 159 SetFrom(&experimental_ns, change.experimental_ns);
160 SetFrom(&intelligibility_enhancer, change.intelligibility_enhancer);
160 SetFrom(&tx_agc_target_dbov, change.tx_agc_target_dbov); 161 SetFrom(&tx_agc_target_dbov, change.tx_agc_target_dbov);
161 SetFrom(&tx_agc_digital_compression_gain, 162 SetFrom(&tx_agc_digital_compression_gain,
162 change.tx_agc_digital_compression_gain); 163 change.tx_agc_digital_compression_gain);
163 SetFrom(&tx_agc_limiter, change.tx_agc_limiter); 164 SetFrom(&tx_agc_limiter, change.tx_agc_limiter);
164 SetFrom(&recording_sample_rate, change.recording_sample_rate); 165 SetFrom(&recording_sample_rate, change.recording_sample_rate);
165 SetFrom(&playout_sample_rate, change.playout_sample_rate); 166 SetFrom(&playout_sample_rate, change.playout_sample_rate);
166 SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe); 167 SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe);
167 } 168 }
168 169
169 bool operator==(const AudioOptions& o) const { 170 bool operator==(const AudioOptions& o) const {
170 return echo_cancellation == o.echo_cancellation && 171 return echo_cancellation == o.echo_cancellation &&
171 auto_gain_control == o.auto_gain_control && 172 auto_gain_control == o.auto_gain_control &&
172 noise_suppression == o.noise_suppression && 173 noise_suppression == o.noise_suppression &&
173 highpass_filter == o.highpass_filter && 174 highpass_filter == o.highpass_filter &&
174 stereo_swapping == o.stereo_swapping && 175 stereo_swapping == o.stereo_swapping &&
175 audio_jitter_buffer_max_packets == o.audio_jitter_buffer_max_packets && 176 audio_jitter_buffer_max_packets == o.audio_jitter_buffer_max_packets &&
176 audio_jitter_buffer_fast_accelerate == 177 audio_jitter_buffer_fast_accelerate ==
177 o.audio_jitter_buffer_fast_accelerate && 178 o.audio_jitter_buffer_fast_accelerate &&
178 typing_detection == o.typing_detection && 179 typing_detection == o.typing_detection &&
179 aecm_generate_comfort_noise == o.aecm_generate_comfort_noise && 180 aecm_generate_comfort_noise == o.aecm_generate_comfort_noise &&
180 experimental_agc == o.experimental_agc && 181 experimental_agc == o.experimental_agc &&
181 extended_filter_aec == o.extended_filter_aec && 182 extended_filter_aec == o.extended_filter_aec &&
182 delay_agnostic_aec == o.delay_agnostic_aec && 183 delay_agnostic_aec == o.delay_agnostic_aec &&
183 experimental_ns == o.experimental_ns && 184 experimental_ns == o.experimental_ns &&
185 intelligibility_enhancer == o.intelligibility_enhancer &&
184 adjust_agc_delta == o.adjust_agc_delta && 186 adjust_agc_delta == o.adjust_agc_delta &&
185 tx_agc_target_dbov == o.tx_agc_target_dbov && 187 tx_agc_target_dbov == o.tx_agc_target_dbov &&
186 tx_agc_digital_compression_gain == o.tx_agc_digital_compression_gain && 188 tx_agc_digital_compression_gain == o.tx_agc_digital_compression_gain &&
187 tx_agc_limiter == o.tx_agc_limiter && 189 tx_agc_limiter == o.tx_agc_limiter &&
188 recording_sample_rate == o.recording_sample_rate && 190 recording_sample_rate == o.recording_sample_rate &&
189 playout_sample_rate == o.playout_sample_rate && 191 playout_sample_rate == o.playout_sample_rate &&
190 combined_audio_video_bwe == o.combined_audio_video_bwe; 192 combined_audio_video_bwe == o.combined_audio_video_bwe;
191 } 193 }
192 bool operator!=(const AudioOptions& o) const { return !(*this == o); } 194 bool operator!=(const AudioOptions& o) const { return !(*this == o); }
193 195
194 std::string ToString() const { 196 std::string ToString() const {
195 std::ostringstream ost; 197 std::ostringstream ost;
196 ost << "AudioOptions {"; 198 ost << "AudioOptions {";
197 ost << ToStringIfSet("aec", echo_cancellation); 199 ost << ToStringIfSet("aec", echo_cancellation);
198 ost << ToStringIfSet("agc", auto_gain_control); 200 ost << ToStringIfSet("agc", auto_gain_control);
199 ost << ToStringIfSet("ns", noise_suppression); 201 ost << ToStringIfSet("ns", noise_suppression);
200 ost << ToStringIfSet("hf", highpass_filter); 202 ost << ToStringIfSet("hf", highpass_filter);
201 ost << ToStringIfSet("swap", stereo_swapping); 203 ost << ToStringIfSet("swap", stereo_swapping);
202 ost << ToStringIfSet("audio_jitter_buffer_max_packets", 204 ost << ToStringIfSet("audio_jitter_buffer_max_packets",
203 audio_jitter_buffer_max_packets); 205 audio_jitter_buffer_max_packets);
204 ost << ToStringIfSet("audio_jitter_buffer_fast_accelerate", 206 ost << ToStringIfSet("audio_jitter_buffer_fast_accelerate",
205 audio_jitter_buffer_fast_accelerate); 207 audio_jitter_buffer_fast_accelerate);
206 ost << ToStringIfSet("typing", typing_detection); 208 ost << ToStringIfSet("typing", typing_detection);
207 ost << ToStringIfSet("comfort_noise", aecm_generate_comfort_noise); 209 ost << ToStringIfSet("comfort_noise", aecm_generate_comfort_noise);
208 ost << ToStringIfSet("agc_delta", adjust_agc_delta); 210 ost << ToStringIfSet("agc_delta", adjust_agc_delta);
209 ost << ToStringIfSet("experimental_agc", experimental_agc); 211 ost << ToStringIfSet("experimental_agc", experimental_agc);
210 ost << ToStringIfSet("extended_filter_aec", extended_filter_aec); 212 ost << ToStringIfSet("extended_filter_aec", extended_filter_aec);
211 ost << ToStringIfSet("delay_agnostic_aec", delay_agnostic_aec); 213 ost << ToStringIfSet("delay_agnostic_aec", delay_agnostic_aec);
212 ost << ToStringIfSet("experimental_ns", experimental_ns); 214 ost << ToStringIfSet("experimental_ns", experimental_ns);
215 ost << ToStringIfSet("intelligibility_enhancer", intelligibility_enhancer);
213 ost << ToStringIfSet("tx_agc_target_dbov", tx_agc_target_dbov); 216 ost << ToStringIfSet("tx_agc_target_dbov", tx_agc_target_dbov);
214 ost << ToStringIfSet("tx_agc_digital_compression_gain", 217 ost << ToStringIfSet("tx_agc_digital_compression_gain",
215 tx_agc_digital_compression_gain); 218 tx_agc_digital_compression_gain);
216 ost << ToStringIfSet("tx_agc_limiter", tx_agc_limiter); 219 ost << ToStringIfSet("tx_agc_limiter", tx_agc_limiter);
217 ost << ToStringIfSet("recording_sample_rate", recording_sample_rate); 220 ost << ToStringIfSet("recording_sample_rate", recording_sample_rate);
218 ost << ToStringIfSet("playout_sample_rate", playout_sample_rate); 221 ost << ToStringIfSet("playout_sample_rate", playout_sample_rate);
219 ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe); 222 ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe);
220 ost << "}"; 223 ost << "}";
221 return ost.str(); 224 return ost.str();
222 } 225 }
(...skipping 14 matching lines...) Expand all
237 // Audio receiver jitter buffer (NetEq) fast accelerate mode. 240 // Audio receiver jitter buffer (NetEq) fast accelerate mode.
238 rtc::Optional<bool> audio_jitter_buffer_fast_accelerate; 241 rtc::Optional<bool> audio_jitter_buffer_fast_accelerate;
239 // Audio processing to detect typing. 242 // Audio processing to detect typing.
240 rtc::Optional<bool> typing_detection; 243 rtc::Optional<bool> typing_detection;
241 rtc::Optional<bool> aecm_generate_comfort_noise; 244 rtc::Optional<bool> aecm_generate_comfort_noise;
242 rtc::Optional<int> adjust_agc_delta; 245 rtc::Optional<int> adjust_agc_delta;
243 rtc::Optional<bool> experimental_agc; 246 rtc::Optional<bool> experimental_agc;
244 rtc::Optional<bool> extended_filter_aec; 247 rtc::Optional<bool> extended_filter_aec;
245 rtc::Optional<bool> delay_agnostic_aec; 248 rtc::Optional<bool> delay_agnostic_aec;
246 rtc::Optional<bool> experimental_ns; 249 rtc::Optional<bool> experimental_ns;
250 rtc::Optional<bool> intelligibility_enhancer;
247 // Note that tx_agc_* only applies to non-experimental AGC. 251 // Note that tx_agc_* only applies to non-experimental AGC.
248 rtc::Optional<uint16_t> tx_agc_target_dbov; 252 rtc::Optional<uint16_t> tx_agc_target_dbov;
249 rtc::Optional<uint16_t> tx_agc_digital_compression_gain; 253 rtc::Optional<uint16_t> tx_agc_digital_compression_gain;
250 rtc::Optional<bool> tx_agc_limiter; 254 rtc::Optional<bool> tx_agc_limiter;
251 rtc::Optional<uint32_t> recording_sample_rate; 255 rtc::Optional<uint32_t> recording_sample_rate;
252 rtc::Optional<uint32_t> playout_sample_rate; 256 rtc::Optional<uint32_t> playout_sample_rate;
253 // Enable combined audio+bandwidth BWE. 257 // Enable combined audio+bandwidth BWE.
254 // TODO(pthatcher): This flag is set from the 258 // TODO(pthatcher): This flag is set from the
255 // "googCombinedAudioVideoBwe", but not used anywhere. So delete it, 259 // "googCombinedAudioVideoBwe", but not used anywhere. So delete it,
256 // and check if any other AudioOptions members are unused. 260 // and check if any other AudioOptions members are unused.
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 // Signal when the media channel is ready to send the stream. Arguments are: 1130 // Signal when the media channel is ready to send the stream. Arguments are:
1127 // writable(bool) 1131 // writable(bool)
1128 sigslot::signal1<bool> SignalReadyToSend; 1132 sigslot::signal1<bool> SignalReadyToSend;
1129 // Signal for notifying that the remote side has closed the DataChannel. 1133 // Signal for notifying that the remote side has closed the DataChannel.
1130 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1134 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1131 }; 1135 };
1132 1136
1133 } // namespace cricket 1137 } // namespace cricket
1134 1138
1135 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ 1139 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698