| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 STATE_INPROGRESS, // Offer/answer exchange completed. | 144 STATE_INPROGRESS, // Offer/answer exchange completed. |
| 145 STATE_CLOSED, // Close() was called. | 145 STATE_CLOSED, // Close() was called. |
| 146 }; | 146 }; |
| 147 | 147 |
| 148 enum Error { | 148 enum Error { |
| 149 ERROR_NONE = 0, // no error | 149 ERROR_NONE = 0, // no error |
| 150 ERROR_CONTENT = 1, // channel errors in SetLocalContent/SetRemoteContent | 150 ERROR_CONTENT = 1, // channel errors in SetLocalContent/SetRemoteContent |
| 151 ERROR_TRANSPORT = 2, // transport error of some kind | 151 ERROR_TRANSPORT = 2, // transport error of some kind |
| 152 }; | 152 }; |
| 153 | 153 |
| 154 WebRtcSession(cricket::ChannelManager* channel_manager, | 154 WebRtcSession(webrtc::MediaControllerInterface* media_controller, |
| 155 rtc::Thread* signaling_thread, | 155 rtc::Thread* signaling_thread, |
| 156 rtc::Thread* worker_thread, | 156 rtc::Thread* worker_thread, |
| 157 cricket::PortAllocator* port_allocator); | 157 cricket::PortAllocator* port_allocator); |
| 158 virtual ~WebRtcSession(); | 158 virtual ~WebRtcSession(); |
| 159 | 159 |
| 160 // These are const to allow them to be called from const methods. | 160 // These are const to allow them to be called from const methods. |
| 161 rtc::Thread* signaling_thread() const { return signaling_thread_; } | 161 rtc::Thread* signaling_thread() const { return signaling_thread_; } |
| 162 rtc::Thread* worker_thread() const { return worker_thread_; } | 162 rtc::Thread* worker_thread() const { return worker_thread_; } |
| 163 cricket::PortAllocator* port_allocator() const { return port_allocator_; } | 163 cricket::PortAllocator* port_allocator() const { return port_allocator_; } |
| 164 | 164 |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 451 |
| 452 // Invoked when TransportController connection completion is signaled. | 452 // Invoked when TransportController connection completion is signaled. |
| 453 // Reports stats for all transports in use. | 453 // Reports stats for all transports in use. |
| 454 void ReportTransportStats(); | 454 void ReportTransportStats(); |
| 455 | 455 |
| 456 // Gather the usage of IPv4/IPv6 as best connection. | 456 // Gather the usage of IPv4/IPv6 as best connection. |
| 457 void ReportBestConnectionState(const cricket::TransportStats& stats); | 457 void ReportBestConnectionState(const cricket::TransportStats& stats); |
| 458 | 458 |
| 459 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); | 459 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); |
| 460 | 460 |
| 461 void OnSentPacket_w(cricket::TransportChannel* channel, |
| 462 const rtc::SentPacket& sent_packet); |
| 463 |
| 461 rtc::Thread* const signaling_thread_; | 464 rtc::Thread* const signaling_thread_; |
| 462 rtc::Thread* const worker_thread_; | 465 rtc::Thread* const worker_thread_; |
| 463 cricket::PortAllocator* const port_allocator_; | 466 cricket::PortAllocator* const port_allocator_; |
| 464 | 467 |
| 465 State state_ = STATE_INIT; | 468 State state_ = STATE_INIT; |
| 466 Error error_ = ERROR_NONE; | 469 Error error_ = ERROR_NONE; |
| 467 std::string error_desc_; | 470 std::string error_desc_; |
| 468 | 471 |
| 469 const std::string sid_; | 472 const std::string sid_; |
| 470 bool initial_offerer_ = false; | 473 bool initial_offerer_ = false; |
| 471 | 474 |
| 472 rtc::scoped_ptr<cricket::TransportController> transport_controller_; | 475 rtc::scoped_ptr<cricket::TransportController> transport_controller_; |
| 473 rtc::scoped_ptr<MediaControllerInterface> media_controller_; | 476 MediaControllerInterface* media_controller_; |
| 474 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_; | 477 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_; |
| 475 rtc::scoped_ptr<cricket::VideoChannel> video_channel_; | 478 rtc::scoped_ptr<cricket::VideoChannel> video_channel_; |
| 476 rtc::scoped_ptr<cricket::DataChannel> data_channel_; | 479 rtc::scoped_ptr<cricket::DataChannel> data_channel_; |
| 477 cricket::ChannelManager* channel_manager_; | 480 cricket::ChannelManager* channel_manager_; |
| 478 IceObserver* ice_observer_; | 481 IceObserver* ice_observer_; |
| 479 PeerConnectionInterface::IceConnectionState ice_connection_state_; | 482 PeerConnectionInterface::IceConnectionState ice_connection_state_; |
| 480 bool ice_connection_receiving_; | 483 bool ice_connection_receiving_; |
| 481 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; | 484 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; |
| 482 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; | 485 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; |
| 483 // If the remote peer is using a older version of implementation. | 486 // If the remote peer is using a older version of implementation. |
| (...skipping 21 matching lines...) Expand all Loading... |
| 505 PeerConnectionInterface::BundlePolicy bundle_policy_; | 508 PeerConnectionInterface::BundlePolicy bundle_policy_; |
| 506 | 509 |
| 507 // Declares the RTCP mux policy for the WebRTCSession. | 510 // Declares the RTCP mux policy for the WebRTCSession. |
| 508 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 511 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
| 509 | 512 |
| 510 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 513 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
| 511 }; | 514 }; |
| 512 } // namespace webrtc | 515 } // namespace webrtc |
| 513 | 516 |
| 514 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ | 517 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ |
| OLD | NEW |