| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, | 93 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, |
| 94 const MediaConstraintsInterface* constraints); | 94 const MediaConstraintsInterface* constraints); |
| 95 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, | 95 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, |
| 96 const RTCOfferAnswerOptions& options); | 96 const RTCOfferAnswerOptions& options); |
| 97 virtual void CreateAnswer(CreateSessionDescriptionObserver* observer, | 97 virtual void CreateAnswer(CreateSessionDescriptionObserver* observer, |
| 98 const MediaConstraintsInterface* constraints); | 98 const MediaConstraintsInterface* constraints); |
| 99 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer, | 99 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer, |
| 100 SessionDescriptionInterface* desc); | 100 SessionDescriptionInterface* desc); |
| 101 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, | 101 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, |
| 102 SessionDescriptionInterface* desc); | 102 SessionDescriptionInterface* desc); |
| 103 virtual void SetIceConnectionReceivingTimeout(int timeout_ms); | |
| 104 // TODO(mallinath) : Deprecated version, remove after all clients are updated. | 103 // TODO(mallinath) : Deprecated version, remove after all clients are updated. |
| 105 virtual bool UpdateIce(const IceServers& configuration, | 104 virtual bool UpdateIce(const IceServers& configuration, |
| 106 const MediaConstraintsInterface* constraints); | 105 const MediaConstraintsInterface* constraints); |
| 107 virtual bool UpdateIce( | 106 virtual bool UpdateIce( |
| 108 const PeerConnectionInterface::RTCConfiguration& config); | 107 const PeerConnectionInterface::RTCConfiguration& config); |
| 109 virtual bool AddIceCandidate(const IceCandidateInterface* candidate); | 108 virtual bool AddIceCandidate(const IceCandidateInterface* candidate); |
| 110 | 109 |
| 111 virtual void RegisterUMAObserver(UMAObserver* observer); | 110 virtual void RegisterUMAObserver(UMAObserver* observer); |
| 112 | 111 |
| 113 virtual void Close(); | 112 virtual void Close(); |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; | 186 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; |
| 188 rtc::scoped_ptr<WebRtcSession> session_; | 187 rtc::scoped_ptr<WebRtcSession> session_; |
| 189 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; | 188 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; |
| 190 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; | 189 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; |
| 191 rtc::scoped_ptr<StatsCollector> stats_; | 190 rtc::scoped_ptr<StatsCollector> stats_; |
| 192 }; | 191 }; |
| 193 | 192 |
| 194 } // namespace webrtc | 193 } // namespace webrtc |
| 195 | 194 |
| 196 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 195 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ |
| OLD | NEW |