OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 cricket::TransportChannel* data_rtp_transport_channel() { | 239 cricket::TransportChannel* data_rtp_transport_channel() { |
240 return rtp_transport_channel(data_channel()); | 240 return rtp_transport_channel(data_channel()); |
241 } | 241 } |
242 | 242 |
243 cricket::TransportChannel* data_rtcp_transport_channel() { | 243 cricket::TransportChannel* data_rtcp_transport_channel() { |
244 return rtcp_transport_channel(data_channel()); | 244 return rtcp_transport_channel(data_channel()); |
245 } | 245 } |
246 | 246 |
247 using webrtc::WebRtcSession::SetAudioPlayout; | 247 using webrtc::WebRtcSession::SetAudioPlayout; |
248 using webrtc::WebRtcSession::SetAudioSend; | 248 using webrtc::WebRtcSession::SetAudioSend; |
249 using webrtc::WebRtcSession::SetCaptureDevice; | 249 using webrtc::WebRtcSession::SetSource; |
250 using webrtc::WebRtcSession::SetVideoPlayout; | 250 using webrtc::WebRtcSession::SetVideoPlayout; |
251 using webrtc::WebRtcSession::SetVideoSend; | 251 using webrtc::WebRtcSession::SetVideoSend; |
252 | 252 |
253 private: | 253 private: |
254 cricket::TransportChannel* rtp_transport_channel(cricket::BaseChannel* ch) { | 254 cricket::TransportChannel* rtp_transport_channel(cricket::BaseChannel* ch) { |
255 if (!ch) { | 255 if (!ch) { |
256 return nullptr; | 256 return nullptr; |
257 } | 257 } |
258 return ch->transport_channel(); | 258 return ch->transport_channel(); |
259 } | 259 } |
(...skipping 4134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4394 } | 4394 } |
4395 | 4395 |
4396 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4396 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
4397 // currently fails because upon disconnection and reconnection OnIceComplete is | 4397 // currently fails because upon disconnection and reconnection OnIceComplete is |
4398 // called more than once without returning to IceGatheringGathering. | 4398 // called more than once without returning to IceGatheringGathering. |
4399 | 4399 |
4400 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4400 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
4401 WebRtcSessionTest, | 4401 WebRtcSessionTest, |
4402 testing::Values(ALREADY_GENERATED, | 4402 testing::Values(ALREADY_GENERATED, |
4403 DTLS_IDENTITY_STORE)); | 4403 DTLS_IDENTITY_STORE)); |
OLD | NEW |