OLD | NEW |
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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 change.audio_jitter_buffer_max_packets); | 127 change.audio_jitter_buffer_max_packets); |
128 SetFrom(&audio_jitter_buffer_fast_accelerate, | 128 SetFrom(&audio_jitter_buffer_fast_accelerate, |
129 change.audio_jitter_buffer_fast_accelerate); | 129 change.audio_jitter_buffer_fast_accelerate); |
130 SetFrom(&typing_detection, change.typing_detection); | 130 SetFrom(&typing_detection, change.typing_detection); |
131 SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise); | 131 SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise); |
132 SetFrom(&adjust_agc_delta, change.adjust_agc_delta); | 132 SetFrom(&adjust_agc_delta, change.adjust_agc_delta); |
133 SetFrom(&experimental_agc, change.experimental_agc); | 133 SetFrom(&experimental_agc, change.experimental_agc); |
134 SetFrom(&extended_filter_aec, change.extended_filter_aec); | 134 SetFrom(&extended_filter_aec, change.extended_filter_aec); |
135 SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec); | 135 SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec); |
136 SetFrom(&experimental_ns, change.experimental_ns); | 136 SetFrom(&experimental_ns, change.experimental_ns); |
137 SetFrom(&aec_dump, change.aec_dump); | |
138 SetFrom(&tx_agc_target_dbov, change.tx_agc_target_dbov); | 137 SetFrom(&tx_agc_target_dbov, change.tx_agc_target_dbov); |
139 SetFrom(&tx_agc_digital_compression_gain, | 138 SetFrom(&tx_agc_digital_compression_gain, |
140 change.tx_agc_digital_compression_gain); | 139 change.tx_agc_digital_compression_gain); |
141 SetFrom(&tx_agc_limiter, change.tx_agc_limiter); | 140 SetFrom(&tx_agc_limiter, change.tx_agc_limiter); |
142 SetFrom(&recording_sample_rate, change.recording_sample_rate); | 141 SetFrom(&recording_sample_rate, change.recording_sample_rate); |
143 SetFrom(&playout_sample_rate, change.playout_sample_rate); | 142 SetFrom(&playout_sample_rate, change.playout_sample_rate); |
144 SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe); | 143 SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe); |
145 } | 144 } |
146 | 145 |
147 bool operator==(const AudioOptions& o) const { | 146 bool operator==(const AudioOptions& o) const { |
148 return echo_cancellation == o.echo_cancellation && | 147 return echo_cancellation == o.echo_cancellation && |
149 auto_gain_control == o.auto_gain_control && | 148 auto_gain_control == o.auto_gain_control && |
150 noise_suppression == o.noise_suppression && | 149 noise_suppression == o.noise_suppression && |
151 highpass_filter == o.highpass_filter && | 150 highpass_filter == o.highpass_filter && |
152 stereo_swapping == o.stereo_swapping && | 151 stereo_swapping == o.stereo_swapping && |
153 audio_jitter_buffer_max_packets == o.audio_jitter_buffer_max_packets && | 152 audio_jitter_buffer_max_packets == o.audio_jitter_buffer_max_packets && |
154 audio_jitter_buffer_fast_accelerate == | 153 audio_jitter_buffer_fast_accelerate == |
155 o.audio_jitter_buffer_fast_accelerate && | 154 o.audio_jitter_buffer_fast_accelerate && |
156 typing_detection == o.typing_detection && | 155 typing_detection == o.typing_detection && |
157 aecm_generate_comfort_noise == o.aecm_generate_comfort_noise && | 156 aecm_generate_comfort_noise == o.aecm_generate_comfort_noise && |
158 experimental_agc == o.experimental_agc && | 157 experimental_agc == o.experimental_agc && |
159 extended_filter_aec == o.extended_filter_aec && | 158 extended_filter_aec == o.extended_filter_aec && |
160 delay_agnostic_aec == o.delay_agnostic_aec && | 159 delay_agnostic_aec == o.delay_agnostic_aec && |
161 experimental_ns == o.experimental_ns && | 160 experimental_ns == o.experimental_ns && |
162 adjust_agc_delta == o.adjust_agc_delta && | 161 adjust_agc_delta == o.adjust_agc_delta && |
163 aec_dump == o.aec_dump && | |
164 tx_agc_target_dbov == o.tx_agc_target_dbov && | 162 tx_agc_target_dbov == o.tx_agc_target_dbov && |
165 tx_agc_digital_compression_gain == o.tx_agc_digital_compression_gain && | 163 tx_agc_digital_compression_gain == o.tx_agc_digital_compression_gain && |
166 tx_agc_limiter == o.tx_agc_limiter && | 164 tx_agc_limiter == o.tx_agc_limiter && |
167 recording_sample_rate == o.recording_sample_rate && | 165 recording_sample_rate == o.recording_sample_rate && |
168 playout_sample_rate == o.playout_sample_rate && | 166 playout_sample_rate == o.playout_sample_rate && |
169 combined_audio_video_bwe == o.combined_audio_video_bwe; | 167 combined_audio_video_bwe == o.combined_audio_video_bwe; |
170 } | 168 } |
171 | 169 |
172 std::string ToString() const { | 170 std::string ToString() const { |
173 std::ostringstream ost; | 171 std::ostringstream ost; |
174 ost << "AudioOptions {"; | 172 ost << "AudioOptions {"; |
175 ost << ToStringIfSet("aec", echo_cancellation); | 173 ost << ToStringIfSet("aec", echo_cancellation); |
176 ost << ToStringIfSet("agc", auto_gain_control); | 174 ost << ToStringIfSet("agc", auto_gain_control); |
177 ost << ToStringIfSet("ns", noise_suppression); | 175 ost << ToStringIfSet("ns", noise_suppression); |
178 ost << ToStringIfSet("hf", highpass_filter); | 176 ost << ToStringIfSet("hf", highpass_filter); |
179 ost << ToStringIfSet("swap", stereo_swapping); | 177 ost << ToStringIfSet("swap", stereo_swapping); |
180 ost << ToStringIfSet("audio_jitter_buffer_max_packets", | 178 ost << ToStringIfSet("audio_jitter_buffer_max_packets", |
181 audio_jitter_buffer_max_packets); | 179 audio_jitter_buffer_max_packets); |
182 ost << ToStringIfSet("audio_jitter_buffer_fast_accelerate", | 180 ost << ToStringIfSet("audio_jitter_buffer_fast_accelerate", |
183 audio_jitter_buffer_fast_accelerate); | 181 audio_jitter_buffer_fast_accelerate); |
184 ost << ToStringIfSet("typing", typing_detection); | 182 ost << ToStringIfSet("typing", typing_detection); |
185 ost << ToStringIfSet("comfort_noise", aecm_generate_comfort_noise); | 183 ost << ToStringIfSet("comfort_noise", aecm_generate_comfort_noise); |
186 ost << ToStringIfSet("agc_delta", adjust_agc_delta); | 184 ost << ToStringIfSet("agc_delta", adjust_agc_delta); |
187 ost << ToStringIfSet("experimental_agc", experimental_agc); | 185 ost << ToStringIfSet("experimental_agc", experimental_agc); |
188 ost << ToStringIfSet("extended_filter_aec", extended_filter_aec); | 186 ost << ToStringIfSet("extended_filter_aec", extended_filter_aec); |
189 ost << ToStringIfSet("delay_agnostic_aec", delay_agnostic_aec); | 187 ost << ToStringIfSet("delay_agnostic_aec", delay_agnostic_aec); |
190 ost << ToStringIfSet("experimental_ns", experimental_ns); | 188 ost << ToStringIfSet("experimental_ns", experimental_ns); |
191 ost << ToStringIfSet("aec_dump", aec_dump); | |
192 ost << ToStringIfSet("tx_agc_target_dbov", tx_agc_target_dbov); | 189 ost << ToStringIfSet("tx_agc_target_dbov", tx_agc_target_dbov); |
193 ost << ToStringIfSet("tx_agc_digital_compression_gain", | 190 ost << ToStringIfSet("tx_agc_digital_compression_gain", |
194 tx_agc_digital_compression_gain); | 191 tx_agc_digital_compression_gain); |
195 ost << ToStringIfSet("tx_agc_limiter", tx_agc_limiter); | 192 ost << ToStringIfSet("tx_agc_limiter", tx_agc_limiter); |
196 ost << ToStringIfSet("recording_sample_rate", recording_sample_rate); | 193 ost << ToStringIfSet("recording_sample_rate", recording_sample_rate); |
197 ost << ToStringIfSet("playout_sample_rate", playout_sample_rate); | 194 ost << ToStringIfSet("playout_sample_rate", playout_sample_rate); |
198 ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe); | 195 ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe); |
199 ost << "}"; | 196 ost << "}"; |
200 return ost.str(); | 197 return ost.str(); |
201 } | 198 } |
(...skipping 14 matching lines...) Expand all Loading... |
216 // Audio receiver jitter buffer (NetEq) fast accelerate mode. | 213 // Audio receiver jitter buffer (NetEq) fast accelerate mode. |
217 rtc::Optional<bool> audio_jitter_buffer_fast_accelerate; | 214 rtc::Optional<bool> audio_jitter_buffer_fast_accelerate; |
218 // Audio processing to detect typing. | 215 // Audio processing to detect typing. |
219 rtc::Optional<bool> typing_detection; | 216 rtc::Optional<bool> typing_detection; |
220 rtc::Optional<bool> aecm_generate_comfort_noise; | 217 rtc::Optional<bool> aecm_generate_comfort_noise; |
221 rtc::Optional<int> adjust_agc_delta; | 218 rtc::Optional<int> adjust_agc_delta; |
222 rtc::Optional<bool> experimental_agc; | 219 rtc::Optional<bool> experimental_agc; |
223 rtc::Optional<bool> extended_filter_aec; | 220 rtc::Optional<bool> extended_filter_aec; |
224 rtc::Optional<bool> delay_agnostic_aec; | 221 rtc::Optional<bool> delay_agnostic_aec; |
225 rtc::Optional<bool> experimental_ns; | 222 rtc::Optional<bool> experimental_ns; |
226 rtc::Optional<bool> aec_dump; | |
227 // Note that tx_agc_* only applies to non-experimental AGC. | 223 // Note that tx_agc_* only applies to non-experimental AGC. |
228 rtc::Optional<uint16_t> tx_agc_target_dbov; | 224 rtc::Optional<uint16_t> tx_agc_target_dbov; |
229 rtc::Optional<uint16_t> tx_agc_digital_compression_gain; | 225 rtc::Optional<uint16_t> tx_agc_digital_compression_gain; |
230 rtc::Optional<bool> tx_agc_limiter; | 226 rtc::Optional<bool> tx_agc_limiter; |
231 rtc::Optional<uint32_t> recording_sample_rate; | 227 rtc::Optional<uint32_t> recording_sample_rate; |
232 rtc::Optional<uint32_t> playout_sample_rate; | 228 rtc::Optional<uint32_t> playout_sample_rate; |
233 // Enable combined audio+bandwidth BWE. | 229 // Enable combined audio+bandwidth BWE. |
234 // TODO(pthatcher): This flag is set from the | 230 // TODO(pthatcher): This flag is set from the |
235 // "googCombinedAudioVideoBwe", but not used anywhere. So delete it, | 231 // "googCombinedAudioVideoBwe", but not used anywhere. So delete it, |
236 // and check if any other AudioOptions members are unused. | 232 // and check if any other AudioOptions members are unused. |
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1107 // Signal when the media channel is ready to send the stream. Arguments are: | 1103 // Signal when the media channel is ready to send the stream. Arguments are: |
1108 // writable(bool) | 1104 // writable(bool) |
1109 sigslot::signal1<bool> SignalReadyToSend; | 1105 sigslot::signal1<bool> SignalReadyToSend; |
1110 // Signal for notifying that the remote side has closed the DataChannel. | 1106 // Signal for notifying that the remote side has closed the DataChannel. |
1111 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; | 1107 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; |
1112 }; | 1108 }; |
1113 | 1109 |
1114 } // namespace cricket | 1110 } // namespace cricket |
1115 | 1111 |
1116 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 1112 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
OLD | NEW |