| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 // When the media processor registers with the engine, the ssrc is cached | 259 // When the media processor registers with the engine, the ssrc is cached |
| 260 // here so that a look up need not be made when the callback is invoked. | 260 // here so that a look up need not be made when the callback is invoked. |
| 261 // This is necessary because the lookup results in mux_channels_cs lock being | 261 // This is necessary because the lookup results in mux_channels_cs lock being |
| 262 // held and if a remote participant leaves the hangout at the same time | 262 // held and if a remote participant leaves the hangout at the same time |
| 263 // we hit a deadlock. | 263 // we hit a deadlock. |
| 264 uint32 tx_processor_ssrc_; | 264 uint32 tx_processor_ssrc_; |
| 265 uint32 rx_processor_ssrc_; | 265 uint32 rx_processor_ssrc_; |
| 266 | 266 |
| 267 rtc::CriticalSection signal_media_critical_; | 267 rtc::CriticalSection signal_media_critical_; |
| 268 | 268 |
| 269 // Cache received extended_filter_aec, delay_agnostic_aec and experimental_ns | 269 // Cache received experimental_aec, delay_agnostic_aec and experimental_ns |
| 270 // values, and apply them in case they are missing in the audio options. We | 270 // values, and apply them in case they are missing in the audio options. We |
| 271 // need to do this because SetExtraOptions() will revert to defaults for | 271 // need to do this because SetExtraOptions() will revert to defaults for |
| 272 // options which are not provided. | 272 // options which are not provided. |
| 273 Settable<bool> extended_filter_aec_; | 273 Settable<bool> experimental_aec_; |
| 274 Settable<bool> delay_agnostic_aec_; | 274 Settable<bool> delay_agnostic_aec_; |
| 275 Settable<bool> experimental_ns_; | 275 Settable<bool> experimental_ns_; |
| 276 }; | 276 }; |
| 277 | 277 |
| 278 // WebRtcVoiceMediaChannel is an implementation of VoiceMediaChannel that uses | 278 // WebRtcVoiceMediaChannel is an implementation of VoiceMediaChannel that uses |
| 279 // WebRtc Voice Engine. | 279 // WebRtc Voice Engine. |
| 280 class WebRtcVoiceMediaChannel : public VoiceMediaChannel, | 280 class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
| 281 public webrtc::Transport { | 281 public webrtc::Transport { |
| 282 public: | 282 public: |
| 283 explicit WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine); | 283 explicit WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 452 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
| 453 | 453 |
| 454 // Do not lock this on the VoE media processor thread; potential for deadlock | 454 // Do not lock this on the VoE media processor thread; potential for deadlock |
| 455 // exists. | 455 // exists. |
| 456 mutable rtc::CriticalSection receive_channels_cs_; | 456 mutable rtc::CriticalSection receive_channels_cs_; |
| 457 }; | 457 }; |
| 458 | 458 |
| 459 } // namespace cricket | 459 } // namespace cricket |
| 460 | 460 |
| 461 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ | 461 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ |
| OLD | NEW |