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

Side by Side Diff: talk/app/webrtc/peerconnectionfactoryproxy.h

Issue 1462253002: Adding CreatePeerConnection method that uses new PC Initialize method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing Windows compile errors. Created 5 years 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
« no previous file with comments | « talk/app/webrtc/peerconnectionfactory.cc ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 29 matching lines...) Expand all
40 PROXY_METHOD1(void, SetOptions, const Options&) 40 PROXY_METHOD1(void, SetOptions, const Options&)
41 // Can't use PROXY_METHOD5 because scoped_ptr must be Pass()ed. 41 // Can't use PROXY_METHOD5 because scoped_ptr must be Pass()ed.
42 // TODO(tommi,hbos): Use of templates to support scoped_ptr? 42 // TODO(tommi,hbos): Use of templates to support scoped_ptr?
43 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 43 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
44 const PeerConnectionInterface::RTCConfiguration& a1, 44 const PeerConnectionInterface::RTCConfiguration& a1,
45 const MediaConstraintsInterface* a2, 45 const MediaConstraintsInterface* a2,
46 PortAllocatorFactoryInterface* a3, 46 PortAllocatorFactoryInterface* a3,
47 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, 47 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
48 PeerConnectionObserver* a5) override { 48 PeerConnectionObserver* a5) override {
49 return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( 49 return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
50 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this, 50 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot1, this,
51 a1, a2, a3, a4.release(), a5)); 51 a1, a2, a3, a4.release(), a5));
52 } 52 }
53 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
54 const PeerConnectionInterface::RTCConfiguration& a1,
55 const MediaConstraintsInterface* a2,
56 rtc::scoped_ptr<cricket::PortAllocator> a3,
57 rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
58 PeerConnectionObserver* a5) override {
59 return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
60 rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot2, this,
61 a1, a2, a3.release(), a4.release(), a5));
62 }
53 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, 63 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
54 CreateLocalMediaStream, const std::string&) 64 CreateLocalMediaStream, const std::string&)
55 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, 65 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
56 CreateAudioSource, const MediaConstraintsInterface*) 66 CreateAudioSource, const MediaConstraintsInterface*)
57 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, 67 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>,
58 CreateVideoSource, cricket::VideoCapturer*, 68 CreateVideoSource, cricket::VideoCapturer*,
59 const MediaConstraintsInterface*) 69 const MediaConstraintsInterface*)
60 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, 70 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
61 CreateVideoTrack, const std::string&, VideoSourceInterface*) 71 CreateVideoTrack, const std::string&, VideoSourceInterface*)
62 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, 72 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
63 CreateAudioTrack, const std::string&, AudioSourceInterface*) 73 CreateAudioTrack, const std::string&, AudioSourceInterface*)
64 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) 74 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile)
65 PROXY_METHOD0(void, StopAecDump) 75 PROXY_METHOD0(void, StopAecDump)
66 PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile) 76 PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile)
67 PROXY_METHOD0(void, StopRtcEventLog) 77 PROXY_METHOD0(void, StopRtcEventLog)
68 78
69 private: 79 private:
70 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( 80 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot1(
71 const PeerConnectionInterface::RTCConfiguration& a1, 81 const PeerConnectionInterface::RTCConfiguration& a1,
72 const MediaConstraintsInterface* a2, 82 const MediaConstraintsInterface* a2,
73 PortAllocatorFactoryInterface* a3, 83 PortAllocatorFactoryInterface* a3,
74 DtlsIdentityStoreInterface* a4, 84 DtlsIdentityStoreInterface* a4,
75 PeerConnectionObserver* a5) { 85 PeerConnectionObserver* a5) {
76 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); 86 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
77 return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5); 87 return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5);
78 } 88 }
89
90 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot2(
91 const PeerConnectionInterface::RTCConfiguration& a1,
92 const MediaConstraintsInterface* a2,
93 cricket::PortAllocator* a3,
94 DtlsIdentityStoreInterface* a4,
95 PeerConnectionObserver* a5) {
96 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
97 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
98 return c_->CreatePeerConnection(a1, a2, ptr_a3.Pass(), ptr_a4.Pass(), a5);
99 }
79 END_PROXY() 100 END_PROXY()
80 101
81 } // namespace webrtc 102 } // namespace webrtc
82 103
83 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 104 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectionfactory.cc ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698