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