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 15 matching lines...) Expand all Loading... |
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<rtc::RTCCertificateGeneratorInterface> 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_FROM_HERE, |
36 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, | 37 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
37 this, a1, a2, a3.release(), a4.release(), a5)); | 38 this, a1, a2, a3.release(), a4.release(), a5)); |
38 } | 39 } |
39 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( | 40 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
40 const PeerConnectionInterface::RTCConfiguration& a1, | 41 const PeerConnectionInterface::RTCConfiguration& a1, |
41 std::unique_ptr<cricket::PortAllocator> a3, | 42 std::unique_ptr<cricket::PortAllocator> a3, |
42 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4, | 43 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4, |
43 PeerConnectionObserver* a5) override { | 44 PeerConnectionObserver* a5) override { |
44 return signaling_thread_ | 45 return signaling_thread_ |
45 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( | 46 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
| 47 RTC_FROM_HERE, |
46 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, | 48 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
47 this, a1, a3.release(), a4.release(), a5)); | 49 this, a1, a3.release(), a4.release(), a5)); |
48 } | 50 } |
49 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, | 51 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, |
50 CreateLocalMediaStream, const std::string&) | 52 CreateLocalMediaStream, const std::string&) |
51 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 53 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
52 CreateAudioSource, const MediaConstraintsInterface*) | 54 CreateAudioSource, const MediaConstraintsInterface*) |
53 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 55 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
54 CreateAudioSource, | 56 CreateAudioSource, |
55 const cricket::AudioOptions&) | 57 const cricket::AudioOptions&) |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); | 95 std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); |
94 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); | 96 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); |
95 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), | 97 return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), |
96 a5); | 98 a5); |
97 } | 99 } |
98 END_SIGNALING_PROXY() | 100 END_SIGNALING_PROXY() |
99 | 101 |
100 } // namespace webrtc | 102 } // namespace webrtc |
101 | 103 |
102 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ | 104 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ |
OLD | NEW |