| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2014 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 BEGIN_PROXY_MAP(PeerConnectionFactory) | 23 BEGIN_PROXY_MAP(PeerConnectionFactory) |
| 24 PROXY_METHOD1(void, SetOptions, const Options&) | 24 PROXY_METHOD1(void, SetOptions, const Options&) |
| 25 // Can't use PROXY_METHOD5 because scoped_ptr must be moved. | 25 // Can't use PROXY_METHOD5 because scoped_ptr must be moved. |
| 26 // TODO(tommi,hbos): Use of templates to support scoped_ptr? | 26 // TODO(tommi,hbos): Use of templates to support scoped_ptr? |
| 27 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( | 27 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
| 28 const PeerConnectionInterface::RTCConfiguration& a1, | 28 const PeerConnectionInterface::RTCConfiguration& a1, |
| 29 const MediaConstraintsInterface* a2, | 29 const MediaConstraintsInterface* a2, |
| 30 rtc::scoped_ptr<cricket::PortAllocator> a3, | 30 rtc::scoped_ptr<cricket::PortAllocator> a3, |
| 31 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, | 31 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, |
| 32 PeerConnectionObserver* a5) override { | 32 PeerConnectionObserver* a5) override { |
| 33 return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( | 33 return signaling_thread_ |
| 34 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this, | 34 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
| 35 a1, a2, a3.release(), a4.release(), a5)); | 35 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
| 36 this, a1, a2, a3.release(), a4.release(), a5)); |
| 36 } | 37 } |
| 37 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( | 38 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
| 38 const PeerConnectionInterface::RTCConfiguration& a1, | 39 const PeerConnectionInterface::RTCConfiguration& a1, |
| 39 rtc::scoped_ptr<cricket::PortAllocator> a3, | 40 rtc::scoped_ptr<cricket::PortAllocator> a3, |
| 40 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, | 41 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, |
| 41 PeerConnectionObserver* a5) override { | 42 PeerConnectionObserver* a5) override { |
| 42 return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( | 43 return signaling_thread_ |
| 43 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this, | 44 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
| 44 a1, a3.release(), a4.release(), a5)); | 45 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
| 46 this, a1, a3.release(), a4.release(), a5)); |
| 45 } | 47 } |
| 46 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, | 48 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, |
| 47 CreateLocalMediaStream, const std::string&) | 49 CreateLocalMediaStream, const std::string&) |
| 48 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 50 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
| 49 CreateAudioSource, const MediaConstraintsInterface*) | 51 CreateAudioSource, const MediaConstraintsInterface*) |
| 50 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 52 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
| 51 CreateAudioSource, | 53 CreateAudioSource, |
| 52 const cricket::AudioOptions&) | 54 const cricket::AudioOptions&) |
| 53 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>, | 55 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>, |
| 54 CreateVideoSource, | 56 CreateVideoSource, |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); | 91 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); |
| 90 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); | 92 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); |
| 91 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), | 93 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), |
| 92 a5); | 94 a5); |
| 93 } | 95 } |
| 94 END_PROXY() | 96 END_PROXY() |
| 95 | 97 |
| 96 } // namespace webrtc | 98 } // namespace webrtc |
| 97 | 99 |
| 98 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ | 100 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ |
| OLD | NEW |