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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 | 70 |
71 // PeerConnection implements the PeerConnectionInterface interface. | 71 // PeerConnection implements the PeerConnectionInterface interface. |
72 // It uses WebRtcSession to implement the PeerConnection functionality. | 72 // It uses WebRtcSession to implement the PeerConnection functionality. |
73 class PeerConnection : public PeerConnectionInterface, | 73 class PeerConnection : public PeerConnectionInterface, |
74 public IceObserver, | 74 public IceObserver, |
75 public rtc::MessageHandler, | 75 public rtc::MessageHandler, |
76 public sigslot::has_slots<> { | 76 public sigslot::has_slots<> { |
77 public: | 77 public: |
78 explicit PeerConnection(PeerConnectionFactory* factory); | 78 explicit PeerConnection(PeerConnectionFactory* factory); |
79 | 79 |
| 80 // TODO(deadbeef): Remove this overload of Initialize once everyone is moved |
| 81 // to the new version. |
80 bool Initialize( | 82 bool Initialize( |
81 const PeerConnectionInterface::RTCConfiguration& configuration, | 83 const PeerConnectionInterface::RTCConfiguration& configuration, |
82 const MediaConstraintsInterface* constraints, | 84 const MediaConstraintsInterface* constraints, |
83 PortAllocatorFactoryInterface* allocator_factory, | 85 PortAllocatorFactoryInterface* allocator_factory, |
84 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, | 86 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
85 PeerConnectionObserver* observer); | 87 PeerConnectionObserver* observer); |
| 88 |
| 89 bool Initialize( |
| 90 const PeerConnectionInterface::RTCConfiguration& configuration, |
| 91 const MediaConstraintsInterface* constraints, |
| 92 rtc::scoped_ptr<cricket::PortAllocator> allocator, |
| 93 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
| 94 PeerConnectionObserver* observer); |
| 95 |
86 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; | 96 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; |
87 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; | 97 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; |
88 bool AddStream(MediaStreamInterface* local_stream) override; | 98 bool AddStream(MediaStreamInterface* local_stream) override; |
89 void RemoveStream(MediaStreamInterface* local_stream) override; | 99 void RemoveStream(MediaStreamInterface* local_stream) override; |
90 | 100 |
91 virtual WebRtcSession* session() { return session_.get(); } | 101 virtual WebRtcSession* session() { return session_.get(); } |
92 | 102 |
93 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( | 103 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( |
94 AudioTrackInterface* track) override; | 104 AudioTrackInterface* track) override; |
95 | 105 |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 // because its destruction fires signals (such as VoiceChannelDestroyed) | 399 // because its destruction fires signals (such as VoiceChannelDestroyed) |
390 // which will trigger some final actions in PeerConnection... | 400 // which will trigger some final actions in PeerConnection... |
391 rtc::scoped_ptr<WebRtcSession> session_; | 401 rtc::scoped_ptr<WebRtcSession> session_; |
392 // ... But stats_ depends on session_ so it should be destroyed even earlier. | 402 // ... But stats_ depends on session_ so it should be destroyed even earlier. |
393 rtc::scoped_ptr<StatsCollector> stats_; | 403 rtc::scoped_ptr<StatsCollector> stats_; |
394 }; | 404 }; |
395 | 405 |
396 } // namespace webrtc | 406 } // namespace webrtc |
397 | 407 |
398 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 408 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ |
OLD | NEW |