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

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

Issue 2020633002: Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/api/peerconnection.cc » ('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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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_PEERCONNECTION_H_ 11 #ifndef WEBRTC_API_PEERCONNECTION_H_
12 #define WEBRTC_API_PEERCONNECTION_H_ 12 #define WEBRTC_API_PEERCONNECTION_H_
13 13
14 #include <string> 14 #include <string>
15 #include <map> 15 #include <map>
16 #include <memory> 16 #include <memory>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/api/dtlsidentitystore.h"
19 #include "webrtc/api/peerconnectionfactory.h" 20 #include "webrtc/api/peerconnectionfactory.h"
20 #include "webrtc/api/peerconnectioninterface.h" 21 #include "webrtc/api/peerconnectioninterface.h"
21 #include "webrtc/api/rtpreceiverinterface.h" 22 #include "webrtc/api/rtpreceiverinterface.h"
22 #include "webrtc/api/rtpsenderinterface.h" 23 #include "webrtc/api/rtpsenderinterface.h"
23 #include "webrtc/api/statscollector.h" 24 #include "webrtc/api/statscollector.h"
24 #include "webrtc/api/streamcollection.h" 25 #include "webrtc/api/streamcollection.h"
25 #include "webrtc/api/webrtcsession.h" 26 #include "webrtc/api/webrtcsession.h"
26 27
27 namespace webrtc { 28 namespace webrtc {
28 29
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 class PeerConnection : public PeerConnectionInterface, 63 class PeerConnection : public PeerConnectionInterface,
63 public IceObserver, 64 public IceObserver,
64 public rtc::MessageHandler, 65 public rtc::MessageHandler,
65 public sigslot::has_slots<> { 66 public sigslot::has_slots<> {
66 public: 67 public:
67 explicit PeerConnection(PeerConnectionFactory* factory); 68 explicit PeerConnection(PeerConnectionFactory* factory);
68 69
69 bool Initialize( 70 bool Initialize(
70 const PeerConnectionInterface::RTCConfiguration& configuration, 71 const PeerConnectionInterface::RTCConfiguration& configuration,
71 std::unique_ptr<cricket::PortAllocator> allocator, 72 std::unique_ptr<cricket::PortAllocator> allocator,
72 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 73 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
73 PeerConnectionObserver* observer); 74 PeerConnectionObserver* observer);
74 75
75 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; 76 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
76 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; 77 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
77 bool AddStream(MediaStreamInterface* local_stream) override; 78 bool AddStream(MediaStreamInterface* local_stream) override;
78 void RemoveStream(MediaStreamInterface* local_stream) override; 79 void RemoveStream(MediaStreamInterface* local_stream) override;
79 80
80 rtc::scoped_refptr<RtpSenderInterface> AddTrack( 81 rtc::scoped_refptr<RtpSenderInterface> AddTrack(
81 MediaStreamTrackInterface* track, 82 MediaStreamTrackInterface* track,
82 std::vector<MediaStreamInterface*> streams) override; 83 std::vector<MediaStreamInterface*> streams) override;
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; 404 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_;
404 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; 405 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_;
405 406
406 std::unique_ptr<WebRtcSession> session_; 407 std::unique_ptr<WebRtcSession> session_;
407 std::unique_ptr<StatsCollector> stats_; 408 std::unique_ptr<StatsCollector> stats_;
408 }; 409 };
409 410
410 } // namespace webrtc 411 } // namespace webrtc
411 412
412 #endif // WEBRTC_API_PEERCONNECTION_H_ 413 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698