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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/app/webrtc/peerconnectionfactory.cc ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/peerconnectionfactoryproxy.h
diff --git a/talk/app/webrtc/peerconnectionfactoryproxy.h b/talk/app/webrtc/peerconnectionfactoryproxy.h
index 5e924df3a13ba22276efbf5ee15457caf83f9964..9013ea503885af37aef29b5528c15fa87cb8a43f 100644
--- a/talk/app/webrtc/peerconnectionfactoryproxy.h
+++ b/talk/app/webrtc/peerconnectionfactoryproxy.h
@@ -47,9 +47,19 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
PeerConnectionObserver* a5) override {
return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
- rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this,
+ rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot1, this,
a1, a2, a3, a4.release(), a5));
}
+ rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
+ const PeerConnectionInterface::RTCConfiguration& a1,
+ const MediaConstraintsInterface* a2,
+ rtc::scoped_ptr<cricket::PortAllocator> a3,
+ rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
+ PeerConnectionObserver* a5) override {
+ return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
+ rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot2, this,
+ a1, a2, a3.release(), a4.release(), a5));
+ }
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
CreateLocalMediaStream, const std::string&)
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
@@ -67,7 +77,7 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
PROXY_METHOD0(void, StopRtcEventLog)
private:
- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
+ rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot1(
const PeerConnectionInterface::RTCConfiguration& a1,
const MediaConstraintsInterface* a2,
PortAllocatorFactoryInterface* a3,
@@ -76,6 +86,17 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5);
}
+
+ rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot2(
+ const PeerConnectionInterface::RTCConfiguration& a1,
+ const MediaConstraintsInterface* a2,
+ cricket::PortAllocator* a3,
+ DtlsIdentityStoreInterface* a4,
+ PeerConnectionObserver* a5) {
+ rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
+ rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
+ return c_->CreatePeerConnection(a1, a2, ptr_a3.Pass(), ptr_a4.Pass(), a5);
+ }
END_PROXY()
} // namespace webrtc
« 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