| 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 // The ownership of |desc| will be transferred after this call. | 167 // The ownership of |desc| will be transferred after this call. |
| 168 bool SetLocalDescription(SessionDescriptionInterface* desc, | 168 bool SetLocalDescription(SessionDescriptionInterface* desc, |
| 169 std::string* err_desc); | 169 std::string* err_desc); |
| 170 // The ownership of |desc| will be transferred after this call. | 170 // The ownership of |desc| will be transferred after this call. |
| 171 bool SetRemoteDescription(SessionDescriptionInterface* desc, | 171 bool SetRemoteDescription(SessionDescriptionInterface* desc, |
| 172 std::string* err_desc); | 172 std::string* err_desc); |
| 173 bool ProcessIceMessage(const IceCandidateInterface* ice_candidate); | 173 bool ProcessIceMessage(const IceCandidateInterface* ice_candidate); |
| 174 | 174 |
| 175 bool SetIceTransports(PeerConnectionInterface::IceTransportsType type); | 175 bool SetIceTransports(PeerConnectionInterface::IceTransportsType type); |
| 176 | 176 |
| 177 void SetIceConnectionReceivingTimeout(int timeout_ms); |
| 178 |
| 177 const SessionDescriptionInterface* local_description() const { | 179 const SessionDescriptionInterface* local_description() const { |
| 178 return local_desc_.get(); | 180 return local_desc_.get(); |
| 179 } | 181 } |
| 180 const SessionDescriptionInterface* remote_description() const { | 182 const SessionDescriptionInterface* remote_description() const { |
| 181 return remote_desc_.get(); | 183 return remote_desc_.get(); |
| 182 } | 184 } |
| 183 // TODO(pthatcher): Cleanup the distinction between | 185 // TODO(pthatcher): Cleanup the distinction between |
| 184 // SessionDescription and SessionDescriptionInterface and remove | 186 // SessionDescription and SessionDescriptionInterface and remove |
| 185 // these if possible. | 187 // these if possible. |
| 186 const cricket::SessionDescription* base_local_description() const { | 188 const cricket::SessionDescription* base_local_description() const { |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 PeerConnectionInterface::BundlePolicy bundle_policy_; | 424 PeerConnectionInterface::BundlePolicy bundle_policy_; |
| 423 | 425 |
| 424 // Declares the RTCP mux policy for the WebRTCSession. | 426 // Declares the RTCP mux policy for the WebRTCSession. |
| 425 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; | 427 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; |
| 426 | 428 |
| 427 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); | 429 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); |
| 428 }; | 430 }; |
| 429 } // namespace webrtc | 431 } // namespace webrtc |
| 430 | 432 |
| 431 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ | 433 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ |
| OLD | NEW |