| 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 11 matching lines...) Expand all Loading... |
| 22 namespace webrtc { | 22 namespace webrtc { |
| 23 | 23 |
| 24 BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory) | 24 BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory) |
| 25 PROXY_METHOD1(void, SetOptions, const Options&) | 25 PROXY_METHOD1(void, SetOptions, const Options&) |
| 26 // Can't use PROXY_METHOD5 because unique_ptr must be moved. | 26 // Can't use PROXY_METHOD5 because unique_ptr must be moved. |
| 27 // TODO(tommi,hbos): Use of templates to support unique_ptr? | 27 // TODO(tommi,hbos): Use of templates to support unique_ptr? |
| 28 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( | 28 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
| 29 const PeerConnectionInterface::RTCConfiguration& a1, | 29 const PeerConnectionInterface::RTCConfiguration& a1, |
| 30 const MediaConstraintsInterface* a2, | 30 const MediaConstraintsInterface* a2, |
| 31 std::unique_ptr<cricket::PortAllocator> a3, | 31 std::unique_ptr<cricket::PortAllocator> a3, |
| 32 std::unique_ptr<DtlsIdentityStoreInterface> a4, | 32 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4, |
| 33 PeerConnectionObserver* a5) override { | 33 PeerConnectionObserver* a5) override { |
| 34 return signaling_thread_ | 34 return signaling_thread_ |
| 35 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( | 35 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
| 36 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, | 36 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
| 37 this, a1, a2, a3.release(), a4.release(), a5)); | 37 this, a1, a2, a3.release(), a4.release(), a5)); |
| 38 } | 38 } |
| 39 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( | 39 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
| 40 const PeerConnectionInterface::RTCConfiguration& a1, | 40 const PeerConnectionInterface::RTCConfiguration& a1, |
| 41 std::unique_ptr<cricket::PortAllocator> a3, | 41 std::unique_ptr<cricket::PortAllocator> a3, |
| 42 std::unique_ptr<DtlsIdentityStoreInterface> a4, | 42 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4, |
| 43 PeerConnectionObserver* a5) override { | 43 PeerConnectionObserver* a5) override { |
| 44 return signaling_thread_ | 44 return signaling_thread_ |
| 45 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( | 45 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
| 46 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, | 46 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
| 47 this, a1, a3.release(), a4.release(), a5)); | 47 this, a1, a3.release(), a4.release(), a5)); |
| 48 } | 48 } |
| 49 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, | 49 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, |
| 50 CreateLocalMediaStream, const std::string&) | 50 CreateLocalMediaStream, const std::string&) |
| 51 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 51 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
| 52 CreateAudioSource, const MediaConstraintsInterface*) | 52 CreateAudioSource, const MediaConstraintsInterface*) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 70 PROXY_METHOD0(void, StopAecDump) | 70 PROXY_METHOD0(void, StopAecDump) |
| 71 PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile) | 71 PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile) |
| 72 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t) | 72 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t) |
| 73 PROXY_METHOD0(void, StopRtcEventLog) | 73 PROXY_METHOD0(void, StopRtcEventLog) |
| 74 | 74 |
| 75 private: | 75 private: |
| 76 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( | 76 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( |
| 77 const PeerConnectionInterface::RTCConfiguration& a1, | 77 const PeerConnectionInterface::RTCConfiguration& a1, |
| 78 const MediaConstraintsInterface* a2, | 78 const MediaConstraintsInterface* a2, |
| 79 cricket::PortAllocator* a3, | 79 cricket::PortAllocator* a3, |
| 80 DtlsIdentityStoreInterface* a4, | 80 rtc::RTCCertificateGeneratorInterface* a4, |
| 81 PeerConnectionObserver* a5) { | 81 PeerConnectionObserver* a5) { |
| 82 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); | 82 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); |
| 83 std::unique_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); | 83 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); |
| 84 return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), | 84 return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), |
| 85 std::move(ptr_a4), a5); | 85 std::move(ptr_a4), a5); |
| 86 } | 86 } |
| 87 | 87 |
| 88 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( | 88 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( |
| 89 const PeerConnectionInterface::RTCConfiguration& a1, | 89 const PeerConnectionInterface::RTCConfiguration& a1, |
| 90 cricket::PortAllocator* a3, | 90 cricket::PortAllocator* a3, |
| 91 DtlsIdentityStoreInterface* a4, | 91 rtc::RTCCertificateGeneratorInterface* a4, |
| 92 PeerConnectionObserver* a5) { | 92 PeerConnectionObserver* a5) { |
| 93 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); | 93 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); |
| 94 std::unique_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); | 94 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); |
| 95 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), | 95 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), |
| 96 a5); | 96 a5); |
| 97 } | 97 } |
| 98 END_SIGNALING_PROXY() | 98 END_SIGNALING_PROXY() |
| 99 | 99 |
| 100 } // namespace webrtc | 100 } // namespace webrtc |
| 101 | 101 |
| 102 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ | 102 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ |
| OLD | NEW |