| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 | 161 |
| 162 webrtc::Config voe_config_; | 162 webrtc::Config voe_config_; |
| 163 | 163 |
| 164 bool initialized_ = false; | 164 bool initialized_ = false; |
| 165 AudioOptions options_; | 165 AudioOptions options_; |
| 166 | 166 |
| 167 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns | 167 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns |
| 168 // values, and apply them in case they are missing in the audio options. We | 168 // values, and apply them in case they are missing in the audio options. We |
| 169 // need to do this because SetExtraOptions() will revert to defaults for | 169 // need to do this because SetExtraOptions() will revert to defaults for |
| 170 // options which are not provided. | 170 // options which are not provided. |
| 171 rtc::Maybe<bool> extended_filter_aec_; | 171 rtc::Optional<bool> extended_filter_aec_; |
| 172 rtc::Maybe<bool> delay_agnostic_aec_; | 172 rtc::Optional<bool> delay_agnostic_aec_; |
| 173 rtc::Maybe<bool> experimental_ns_; | 173 rtc::Optional<bool> experimental_ns_; |
| 174 | 174 |
| 175 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcVoiceEngine); | 175 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcVoiceEngine); |
| 176 }; | 176 }; |
| 177 | 177 |
| 178 // WebRtcVoiceMediaChannel is an implementation of VoiceMediaChannel that uses | 178 // WebRtcVoiceMediaChannel is an implementation of VoiceMediaChannel that uses |
| 179 // WebRtc Voice Engine. | 179 // WebRtc Voice Engine. |
| 180 class WebRtcVoiceMediaChannel final : public VoiceMediaChannel, | 180 class WebRtcVoiceMediaChannel final : public VoiceMediaChannel, |
| 181 public webrtc::Transport { | 181 public webrtc::Transport { |
| 182 public: | 182 public: |
| 183 WebRtcVoiceMediaChannel(WebRtcVoiceEngine* engine, | 183 WebRtcVoiceMediaChannel(WebRtcVoiceEngine* engine, |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 // the WebRtc thread must be synchronized with edits on the worker thread. | 331 // the WebRtc thread must be synchronized with edits on the worker thread. |
| 332 // Reads on the worker thread are ok. | 332 // Reads on the worker thread are ok. |
| 333 std::vector<RtpHeaderExtension> receive_extensions_; | 333 std::vector<RtpHeaderExtension> receive_extensions_; |
| 334 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 334 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
| 335 | 335 |
| 336 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); | 336 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); |
| 337 }; | 337 }; |
| 338 } // namespace cricket | 338 } // namespace cricket |
| 339 | 339 |
| 340 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ | 340 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ |
| OLD | NEW |