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

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

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with master Created 5 years, 4 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 * 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_ot, this,
51 a1, a2, a3, a4.release(), a5)); 51 a1, a2, a3, a4.release(), a5));
52 } 52 }
53 PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>,
54 CreatePeerConnection,
55 const PeerConnectionInterface::RTCConfiguration&,
56 const MediaConstraintsInterface*,
57 PortAllocatorFactoryInterface*,
58 const rtc::scoped_refptr<DtlsCertificate>&,
59 PeerConnectionObserver*)
53 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, 60 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
54 CreateLocalMediaStream, const std::string&) 61 CreateLocalMediaStream, const std::string&)
55 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, 62 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
56 CreateAudioSource, const MediaConstraintsInterface*) 63 CreateAudioSource, const MediaConstraintsInterface*)
57 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, 64 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>,
58 CreateVideoSource, cricket::VideoCapturer*, 65 CreateVideoSource, cricket::VideoCapturer*,
59 const MediaConstraintsInterface*) 66 const MediaConstraintsInterface*)
60 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, 67 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
61 CreateVideoTrack, const std::string&, VideoSourceInterface*) 68 CreateVideoTrack, const std::string&, VideoSourceInterface*)
62 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, 69 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
63 CreateAudioTrack, const std::string&, AudioSourceInterface*) 70 CreateAudioTrack, const std::string&, AudioSourceInterface*)
64 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) 71 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile)
65 72
66 private: 73 private:
67 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( 74 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
68 const PeerConnectionInterface::RTCConfiguration& a1, 75 const PeerConnectionInterface::RTCConfiguration& a1,
69 const MediaConstraintsInterface* a2, 76 const MediaConstraintsInterface* a2,
70 PortAllocatorFactoryInterface* a3, 77 PortAllocatorFactoryInterface* a3,
71 DtlsIdentityStoreInterface* a4, 78 DtlsIdentityStoreInterface* a4,
72 PeerConnectionObserver* a5) { 79 PeerConnectionObserver* a5) {
73 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); 80 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
74 return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5); 81 return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5);
75 } 82 }
76 END_PROXY() 83 END_PROXY()
77 84
78 } // namespace webrtc 85 } // namespace webrtc
79 86
80 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ 87 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698