Chromium Code Reviews| 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 15 matching lines...) Expand all Loading... | |
| 26 #include "webrtc/base/thread.h" | 26 #include "webrtc/base/thread.h" |
| 27 #include "webrtc/media/base/mediachannel.h" | 27 #include "webrtc/media/base/mediachannel.h" |
| 28 #include "webrtc/p2p/base/candidate.h" | 28 #include "webrtc/p2p/base/candidate.h" |
| 29 #include "webrtc/p2p/base/transportcontroller.h" | 29 #include "webrtc/p2p/base/transportcontroller.h" |
| 30 #include "webrtc/pc/mediasession.h" | 30 #include "webrtc/pc/mediasession.h" |
| 31 | 31 |
| 32 namespace cricket { | 32 namespace cricket { |
| 33 | 33 |
| 34 class ChannelManager; | 34 class ChannelManager; |
| 35 class DataChannel; | 35 class DataChannel; |
| 36 class QuicTransportChannel; | |
| 36 class StatsReport; | 37 class StatsReport; |
| 37 class VideoCapturer; | 38 class VideoCapturer; |
| 38 class VideoChannel; | 39 class VideoChannel; |
| 39 class VoiceChannel; | 40 class VoiceChannel; |
| 40 | 41 |
| 41 } // namespace cricket | 42 } // namespace cricket |
| 42 | 43 |
| 43 namespace webrtc { | 44 namespace webrtc { |
| 44 | 45 |
| 45 class IceRestartAnswerLatch; | 46 class IceRestartAnswerLatch; |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 306 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp); | 307 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp); |
| 307 | 308 |
| 308 // For unit test. | 309 // For unit test. |
| 309 bool waiting_for_certificate_for_testing() const; | 310 bool waiting_for_certificate_for_testing() const; |
| 310 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate_for_testing(); | 311 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate_for_testing(); |
| 311 | 312 |
| 312 void set_metrics_observer( | 313 void set_metrics_observer( |
| 313 webrtc::MetricsObserverInterface* metrics_observer) { | 314 webrtc::MetricsObserverInterface* metrics_observer) { |
| 314 metrics_observer_ = metrics_observer; | 315 metrics_observer_ = metrics_observer; |
| 315 } | 316 } |
| 317 cricket::QuicTransportChannel* quic_transport_channel() const; | |
|
pthatcher1
2016/03/30 20:34:49
Doesn't this need USE_QUIC or HAVE_QUIC as well (a
Taylor Brandstetter
2016/04/01 23:23:42
It's possible that this is NULL when it's needed.
| |
| 316 | 318 |
| 317 // Called when voice_channel_, video_channel_ and data_channel_ are created | 319 // Called when voice_channel_, video_channel_ and data_channel_ are created |
| 318 // and destroyed. As a result of, for example, setting a new description. | 320 // and destroyed. As a result of, for example, setting a new description. |
| 319 sigslot::signal0<> SignalVoiceChannelCreated; | 321 sigslot::signal0<> SignalVoiceChannelCreated; |
| 320 sigslot::signal0<> SignalVoiceChannelDestroyed; | 322 sigslot::signal0<> SignalVoiceChannelDestroyed; |
| 321 sigslot::signal0<> SignalVideoChannelCreated; | 323 sigslot::signal0<> SignalVideoChannelCreated; |
| 322 sigslot::signal0<> SignalVideoChannelDestroyed; | 324 sigslot::signal0<> SignalVideoChannelDestroyed; |
| 323 sigslot::signal0<> SignalDataChannelCreated; | 325 sigslot::signal0<> SignalDataChannelCreated; |
| 324 sigslot::signal0<> SignalDataChannelDestroyed; | 326 sigslot::signal0<> SignalDataChannelDestroyed; |
| 325 // Called when the whole session is destroyed. | 327 // Called when the whole session is destroyed. |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 513 PeerConnectionInterface::BundlePolicy bundle_policy_; | 515 PeerConnectionInterface::BundlePolicy bundle_policy_; |
| 514 | 516 |
| 515 // Declares the RTCP mux policy for the WebRTCSession. | 517 // Declares the RTCP mux policy for the WebRTCSession. |
| 516 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 518 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
| 517 | 519 |
| 518 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 520 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
| 519 }; | 521 }; |
| 520 } // namespace webrtc | 522 } // namespace webrtc |
| 521 | 523 |
| 522 #endif // WEBRTC_API_WEBRTCSESSION_H_ | 524 #endif // WEBRTC_API_WEBRTCSESSION_H_ |
| OLD | NEW |