OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 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 14 matching lines...) Expand all Loading... |
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ |
29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ |
30 | 30 |
31 #include <string> | 31 #include <string> |
32 | 32 |
33 #include "talk/app/webrtc/peerconnectioninterface.h" | 33 #include "talk/app/webrtc/peerconnectioninterface.h" |
34 #include "talk/app/webrtc/proxy.h" | 34 #include "talk/app/webrtc/proxy.h" |
| 35 #include "webrtc/base/bind.h" |
35 | 36 |
36 namespace webrtc { | 37 namespace webrtc { |
37 | 38 |
38 BEGIN_PROXY_MAP(PeerConnectionFactory) | 39 BEGIN_PROXY_MAP(PeerConnectionFactory) |
39 PROXY_METHOD1(void, SetOptions, const Options&) | 40 PROXY_METHOD1(void, SetOptions, const Options&) |
40 PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>, | 41 // Can't use PROXY_METHOD5 because scoped_ptr must be Pass()ed. |
41 CreatePeerConnection, | 42 // TODO(tommi,hbos): Use of templates to support scoped_ptr? |
42 const PeerConnectionInterface::RTCConfiguration&, | 43 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
43 const MediaConstraintsInterface*, | 44 const PeerConnectionInterface::RTCConfiguration& a1, |
44 PortAllocatorFactoryInterface*, | 45 const MediaConstraintsInterface* a2, |
45 DTLSIdentityServiceInterface*, | 46 PortAllocatorFactoryInterface* a3, |
46 PeerConnectionObserver*) | 47 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, |
| 48 PeerConnectionObserver* a5) override { |
| 49 return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
| 50 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this, |
| 51 a1, a2, a3, a4.release(), a5)); |
| 52 } |
47 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, | 53 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, |
48 CreateLocalMediaStream, const std::string&) | 54 CreateLocalMediaStream, const std::string&) |
49 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 55 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
50 CreateAudioSource, const MediaConstraintsInterface*) | 56 CreateAudioSource, const MediaConstraintsInterface*) |
51 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, | 57 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, |
52 CreateVideoSource, cricket::VideoCapturer*, | 58 CreateVideoSource, cricket::VideoCapturer*, |
53 const MediaConstraintsInterface*) | 59 const MediaConstraintsInterface*) |
54 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, | 60 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, |
55 CreateVideoTrack, const std::string&, VideoSourceInterface*) | 61 CreateVideoTrack, const std::string&, VideoSourceInterface*) |
56 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, | 62 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, |
57 CreateAudioTrack, const std::string&, AudioSourceInterface*) | 63 CreateAudioTrack, const std::string&, AudioSourceInterface*) |
58 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) | 64 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) |
| 65 |
| 66 private: |
| 67 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( |
| 68 const PeerConnectionInterface::RTCConfiguration& a1, |
| 69 const MediaConstraintsInterface* a2, |
| 70 PortAllocatorFactoryInterface* a3, |
| 71 DtlsIdentityStoreInterface* a4, |
| 72 PeerConnectionObserver* a5) { |
| 73 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); |
| 74 return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5); |
| 75 } |
59 END_PROXY() | 76 END_PROXY() |
60 | 77 |
61 } // namespace webrtc | 78 } // namespace webrtc |
62 | 79 |
63 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 80 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ |
OLD | NEW |