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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 // description should be used. Output |valid| is true if the candidate media | 365 // description should be used. Output |valid| is true if the candidate media |
366 // index is valid. | 366 // index is valid. |
367 bool ReadyToUseRemoteCandidate(const IceCandidateInterface* candidate, | 367 bool ReadyToUseRemoteCandidate(const IceCandidateInterface* candidate, |
368 const SessionDescriptionInterface* remote_desc, | 368 const SessionDescriptionInterface* remote_desc, |
369 bool* valid); | 369 bool* valid); |
370 | 370 |
371 std::string GetSessionErrorMsg(); | 371 std::string GetSessionErrorMsg(); |
372 | 372 |
373 // Invoked when OnTransportCompleted is signaled to gather the usage | 373 // Invoked when OnTransportCompleted is signaled to gather the usage |
374 // of IPv4/IPv6 as best connection. | 374 // of IPv4/IPv6 as best connection. |
375 void ReportBestConnectionState(cricket::Transport* transport); | 375 void ReportBestConnectionState(const cricket::TransportStats& stats); |
| 376 |
| 377 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); |
376 | 378 |
377 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_; | 379 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_; |
378 rtc::scoped_ptr<cricket::VideoChannel> video_channel_; | 380 rtc::scoped_ptr<cricket::VideoChannel> video_channel_; |
379 rtc::scoped_ptr<cricket::DataChannel> data_channel_; | 381 rtc::scoped_ptr<cricket::DataChannel> data_channel_; |
380 cricket::ChannelManager* channel_manager_; | 382 cricket::ChannelManager* channel_manager_; |
381 MediaStreamSignaling* mediastream_signaling_; | 383 MediaStreamSignaling* mediastream_signaling_; |
382 IceObserver* ice_observer_; | 384 IceObserver* ice_observer_; |
383 PeerConnectionInterface::IceConnectionState ice_connection_state_; | 385 PeerConnectionInterface::IceConnectionState ice_connection_state_; |
384 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; | 386 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; |
385 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; | 387 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; |
(...skipping 28 matching lines...) Expand all Loading... |
414 PeerConnectionInterface::BundlePolicy bundle_policy_; | 416 PeerConnectionInterface::BundlePolicy bundle_policy_; |
415 | 417 |
416 // Declares the RTCP mux policy for the WebRTCSession. | 418 // Declares the RTCP mux policy for the WebRTCSession. |
417 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 419 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
418 | 420 |
419 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 421 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
420 }; | 422 }; |
421 } // namespace webrtc | 423 } // namespace webrtc |
422 | 424 |
423 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ | 425 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ |
OLD | NEW |