Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: webrtc/api/peerconnectionfactoryproxy.h

Issue 1871833002: Rename BEGIN_PROXY_MAP --> BEGIN_SIGNALLING_PROXY_MAP. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ 11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
12 #define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ 12 #define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
13 13
14 #include <string> 14 #include <string>
15 #include <utility> 15 #include <utility>
16 16
17 #include "webrtc/api/peerconnectioninterface.h" 17 #include "webrtc/api/peerconnectioninterface.h"
18 #include "webrtc/api/proxy.h" 18 #include "webrtc/api/proxy.h"
19 #include "webrtc/base/bind.h" 19 #include "webrtc/base/bind.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 BEGIN_PROXY_MAP(PeerConnectionFactory) 23 BEGIN_SIGNALLING_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 signaling_thread_ 33 return signaling_thread_
34 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( 34 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
35 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, 35 rtc::Bind(
36 this, a1, a2, a3.release(), a4.release(), a5)); 36 &PeerConnectionFactorySignallingProxy::CreatePeerConnection_ot,
37 this, a1, a2, a3.release(), a4.release(), a5));
37 } 38 }
38 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 39 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
39 const PeerConnectionInterface::RTCConfiguration& a1, 40 const PeerConnectionInterface::RTCConfiguration& a1,
40 rtc::scoped_ptr<cricket::PortAllocator> a3, 41 rtc::scoped_ptr<cricket::PortAllocator> a3,
41 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, 42 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
42 PeerConnectionObserver* a5) override { 43 PeerConnectionObserver* a5) override {
43 return signaling_thread_ 44 return signaling_thread_
44 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( 45 ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
45 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, 46 rtc::Bind(
46 this, a1, a3.release(), a4.release(), a5)); 47 &PeerConnectionFactorySignallingProxy::CreatePeerConnection_ot,
48 this, a1, a3.release(), a4.release(), a5));
47 } 49 }
48 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, 50 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
49 CreateLocalMediaStream, const std::string&) 51 CreateLocalMediaStream, const std::string&)
50 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, 52 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
51 CreateAudioSource, const MediaConstraintsInterface*) 53 CreateAudioSource, const MediaConstraintsInterface*)
52 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, 54 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
53 CreateAudioSource, 55 CreateAudioSource,
54 const cricket::AudioOptions&) 56 const cricket::AudioOptions&)
55 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>, 57 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>,
56 CreateVideoSource, 58 CreateVideoSource,
(...skipping 29 matching lines...) Expand all
86 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( 88 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
87 const PeerConnectionInterface::RTCConfiguration& a1, 89 const PeerConnectionInterface::RTCConfiguration& a1,
88 cricket::PortAllocator* a3, 90 cricket::PortAllocator* a3,
89 DtlsIdentityStoreInterface* a4, 91 DtlsIdentityStoreInterface* a4,
90 PeerConnectionObserver* a5) { 92 PeerConnectionObserver* a5) {
91 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); 93 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
92 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); 94 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
93 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),
94 a5); 96 a5);
95 } 97 }
96 END_PROXY() 98 END_SIGNALLING_PROXY()
97 99
98 } // namespace webrtc 100 } // namespace webrtc
99 101
100 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ 102 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698