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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 | 133 |
134 enum Error { | 134 enum Error { |
135 ERROR_NONE = 0, // no error | 135 ERROR_NONE = 0, // no error |
136 ERROR_CONTENT = 1, // channel errors in SetLocalContent/SetRemoteContent | 136 ERROR_CONTENT = 1, // channel errors in SetLocalContent/SetRemoteContent |
137 ERROR_TRANSPORT = 2, // transport error of some kind | 137 ERROR_TRANSPORT = 2, // transport error of some kind |
138 }; | 138 }; |
139 | 139 |
140 WebRtcSession(webrtc::MediaControllerInterface* media_controller, | 140 WebRtcSession(webrtc::MediaControllerInterface* media_controller, |
141 rtc::Thread* signaling_thread, | 141 rtc::Thread* signaling_thread, |
142 rtc::Thread* worker_thread, | 142 rtc::Thread* worker_thread, |
| 143 rtc::Thread* network_thread, |
143 cricket::PortAllocator* port_allocator); | 144 cricket::PortAllocator* port_allocator); |
144 virtual ~WebRtcSession(); | 145 virtual ~WebRtcSession(); |
145 | 146 |
146 // These are const to allow them to be called from const methods. | 147 // These are const to allow them to be called from const methods. |
147 rtc::Thread* signaling_thread() const { return signaling_thread_; } | 148 rtc::Thread* signaling_thread() const { return signaling_thread_; } |
148 rtc::Thread* worker_thread() const { return worker_thread_; } | 149 rtc::Thread* worker_thread() const { return worker_thread_; } |
149 cricket::PortAllocator* port_allocator() const { return port_allocator_; } | 150 cricket::PortAllocator* port_allocator() const { return port_allocator_; } |
150 | 151 |
151 // The ID of this session. | 152 // The ID of this session. |
152 const std::string& id() const { return sid_; } | 153 const std::string& id() const { return sid_; } |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 | 459 |
459 // Invoked when TransportController connection completion is signaled. | 460 // Invoked when TransportController connection completion is signaled. |
460 // Reports stats for all transports in use. | 461 // Reports stats for all transports in use. |
461 void ReportTransportStats(); | 462 void ReportTransportStats(); |
462 | 463 |
463 // Gather the usage of IPv4/IPv6 as best connection. | 464 // Gather the usage of IPv4/IPv6 as best connection. |
464 void ReportBestConnectionState(const cricket::TransportStats& stats); | 465 void ReportBestConnectionState(const cricket::TransportStats& stats); |
465 | 466 |
466 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); | 467 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); |
467 | 468 |
468 void OnSentPacket_w(cricket::TransportChannel* channel, | 469 void OnSentPacket_n(cricket::TransportChannel* channel, |
469 const rtc::SentPacket& sent_packet); | 470 const rtc::SentPacket& sent_packet); |
470 | 471 |
471 rtc::Thread* const signaling_thread_; | 472 rtc::Thread* const signaling_thread_; |
472 rtc::Thread* const worker_thread_; | 473 rtc::Thread* const worker_thread_; |
473 cricket::PortAllocator* const port_allocator_; | 474 cricket::PortAllocator* const port_allocator_; |
474 | 475 |
475 State state_ = STATE_INIT; | 476 State state_ = STATE_INIT; |
476 Error error_ = ERROR_NONE; | 477 Error error_ = ERROR_NONE; |
477 std::string error_desc_; | 478 std::string error_desc_; |
478 | 479 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 PeerConnectionInterface::BundlePolicy bundle_policy_; | 516 PeerConnectionInterface::BundlePolicy bundle_policy_; |
516 | 517 |
517 // Declares the RTCP mux policy for the WebRTCSession. | 518 // Declares the RTCP mux policy for the WebRTCSession. |
518 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 519 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
519 | 520 |
520 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 521 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
521 }; | 522 }; |
522 } // namespace webrtc | 523 } // namespace webrtc |
523 | 524 |
524 #endif // WEBRTC_API_WEBRTCSESSION_H_ | 525 #endif // WEBRTC_API_WEBRTCSESSION_H_ |
OLD | NEW |