| 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 30 matching lines...) Expand all Loading... |
| 41 #include "talk/app/webrtc/webrtcsession.h" | 41 #include "talk/app/webrtc/webrtcsession.h" |
| 42 #include "webrtc/base/scoped_ptr.h" | 42 #include "webrtc/base/scoped_ptr.h" |
| 43 | 43 |
| 44 namespace webrtc { | 44 namespace webrtc { |
| 45 | 45 |
| 46 typedef std::vector<PortAllocatorFactoryInterface::StunConfiguration> | 46 typedef std::vector<PortAllocatorFactoryInterface::StunConfiguration> |
| 47 StunConfigurations; | 47 StunConfigurations; |
| 48 typedef std::vector<PortAllocatorFactoryInterface::TurnConfiguration> | 48 typedef std::vector<PortAllocatorFactoryInterface::TurnConfiguration> |
| 49 TurnConfigurations; | 49 TurnConfigurations; |
| 50 | 50 |
| 51 class CallFactory; |
| 52 |
| 51 // Parses the URLs for each server in |servers| to build |stun_config| and | 53 // Parses the URLs for each server in |servers| to build |stun_config| and |
| 52 // |turn_config|. | 54 // |turn_config|. |
| 53 bool ParseIceServers(const PeerConnectionInterface::IceServers& servers, | 55 bool ParseIceServers(const PeerConnectionInterface::IceServers& servers, |
| 54 StunConfigurations* stun_config, | 56 StunConfigurations* stun_config, |
| 55 TurnConfigurations* turn_config); | 57 TurnConfigurations* turn_config); |
| 56 | 58 |
| 57 // PeerConnection implements the PeerConnectionInterface interface. | 59 // PeerConnection implements the PeerConnectionInterface interface. |
| 58 // It uses MediaStreamSignaling and WebRtcSession to implement | 60 // It uses MediaStreamSignaling and WebRtcSession to implement |
| 59 // the PeerConnection functionality. | 61 // the PeerConnection functionality. |
| 60 class PeerConnection : public PeerConnectionInterface, | 62 class PeerConnection : public PeerConnectionInterface, |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 SignalingState signaling_state_; | 196 SignalingState signaling_state_; |
| 195 // TODO(bemasc): Remove ice_state_. | 197 // TODO(bemasc): Remove ice_state_. |
| 196 IceState ice_state_; | 198 IceState ice_state_; |
| 197 IceConnectionState ice_connection_state_; | 199 IceConnectionState ice_connection_state_; |
| 198 IceGatheringState ice_gathering_state_; | 200 IceGatheringState ice_gathering_state_; |
| 199 | 201 |
| 200 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; | 202 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; |
| 201 rtc::scoped_ptr<WebRtcSession> session_; | 203 rtc::scoped_ptr<WebRtcSession> session_; |
| 202 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; | 204 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; |
| 203 rtc::scoped_ptr<StatsCollector> stats_; | 205 rtc::scoped_ptr<StatsCollector> stats_; |
| 206 webrtc::CallFactory call_factory_; |
| 204 | 207 |
| 205 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; | 208 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; |
| 206 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; | 209 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; |
| 207 }; | 210 }; |
| 208 | 211 |
| 209 } // namespace webrtc | 212 } // namespace webrtc |
| 210 | 213 |
| 211 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 214 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ |
| OLD | NEW |