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

Side by Side Diff: talk/app/webrtc/peerconnection.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: webrtcsession_unittest cleanup 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 2012 Google Inc. 3 * Copyright 2012 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 public IceObserver, 54 public IceObserver,
55 public rtc::MessageHandler, 55 public rtc::MessageHandler,
56 public sigslot::has_slots<> { 56 public sigslot::has_slots<> {
57 public: 57 public:
58 explicit PeerConnection(PeerConnectionFactory* factory); 58 explicit PeerConnection(PeerConnectionFactory* factory);
59 59
60 bool Initialize( 60 bool Initialize(
61 const PeerConnectionInterface::RTCConfiguration& configuration, 61 const PeerConnectionInterface::RTCConfiguration& configuration,
62 const MediaConstraintsInterface* constraints, 62 const MediaConstraintsInterface* constraints,
63 PortAllocatorFactoryInterface* allocator_factory, 63 PortAllocatorFactoryInterface* allocator_factory,
64 DTLSIdentityServiceInterface* dtls_identity_service, 64 rtc::scoped_refptr<webrtc::DtlsCertificate> certificate,
65 PeerConnectionObserver* observer); 65 PeerConnectionObserver* observer);
66 virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); 66 virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
67 virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); 67 virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams();
68 virtual bool AddStream(MediaStreamInterface* local_stream); 68 virtual bool AddStream(MediaStreamInterface* local_stream);
69 virtual void RemoveStream(MediaStreamInterface* local_stream); 69 virtual void RemoveStream(MediaStreamInterface* local_stream);
70 70
71 virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( 71 virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
72 AudioTrackInterface* track); 72 AudioTrackInterface* track);
73 73
74 virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( 74 virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 void OnIceGatheringChange(IceGatheringState new_state) override; 150 void OnIceGatheringChange(IceGatheringState new_state) override;
151 void OnIceCandidate(const IceCandidateInterface* candidate) override; 151 void OnIceCandidate(const IceCandidateInterface* candidate) override;
152 void OnIceComplete() override; 152 void OnIceComplete() override;
153 void OnIceConnectionReceivingChange(bool receiving) override; 153 void OnIceConnectionReceivingChange(bool receiving) override;
154 154
155 // Signals from WebRtcSession. 155 // Signals from WebRtcSession.
156 void OnSessionStateChange(cricket::BaseSession* session, 156 void OnSessionStateChange(cricket::BaseSession* session,
157 cricket::BaseSession::State state); 157 cricket::BaseSession::State state);
158 void ChangeSignalingState(SignalingState signaling_state); 158 void ChangeSignalingState(SignalingState signaling_state);
159 159
160 bool DoInitialize(IceTransportsType type,
161 const StunConfigurations& stun_config,
162 const TurnConfigurations& turn_config,
163 const MediaConstraintsInterface* constraints,
164 PortAllocatorFactoryInterface* allocator_factory,
165 DTLSIdentityServiceInterface* dtls_identity_service,
166 PeerConnectionObserver* observer);
hbos 2015/08/04 12:50:21 Declared but not defined, that's why I'm removing
167
168 rtc::Thread* signaling_thread() const { 160 rtc::Thread* signaling_thread() const {
169 return factory_->signaling_thread(); 161 return factory_->signaling_thread();
170 } 162 }
171 163
172 void PostSetSessionDescriptionFailure(SetSessionDescriptionObserver* observer, 164 void PostSetSessionDescriptionFailure(SetSessionDescriptionObserver* observer,
173 const std::string& error); 165 const std::string& error);
174 166
175 bool IsClosed() const { 167 bool IsClosed() const {
176 return signaling_state_ == PeerConnectionInterface::kClosed; 168 return signaling_state_ == PeerConnectionInterface::kClosed;
177 } 169 }
(...skipping 16 matching lines...) Expand all
194 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; 186 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_;
195 rtc::scoped_ptr<WebRtcSession> session_; 187 rtc::scoped_ptr<WebRtcSession> session_;
196 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; 188 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_;
197 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; 189 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_;
198 rtc::scoped_ptr<StatsCollector> stats_; 190 rtc::scoped_ptr<StatsCollector> stats_;
199 }; 191 };
200 192
201 } // namespace webrtc 193 } // namespace webrtc
202 194
203 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 195 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698