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

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

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undid unneccessary changes to rtp_rtcp module. Created 4 years, 9 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 * 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
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 void SetLocalDescription(SetSessionDescriptionObserver* observer, 115 void SetLocalDescription(SetSessionDescriptionObserver* observer,
116 SessionDescriptionInterface* desc) override; 116 SessionDescriptionInterface* desc) override;
117 void SetRemoteDescription(SetSessionDescriptionObserver* observer, 117 void SetRemoteDescription(SetSessionDescriptionObserver* observer,
118 SessionDescriptionInterface* desc) override; 118 SessionDescriptionInterface* desc) override;
119 bool SetConfiguration( 119 bool SetConfiguration(
120 const PeerConnectionInterface::RTCConfiguration& config) override; 120 const PeerConnectionInterface::RTCConfiguration& config) override;
121 bool AddIceCandidate(const IceCandidateInterface* candidate) override; 121 bool AddIceCandidate(const IceCandidateInterface* candidate) override;
122 122
123 void RegisterUMAObserver(UMAObserver* observer) override; 123 void RegisterUMAObserver(UMAObserver* observer) override;
124 124
125 bool StartRtcEventLog(rtc::PlatformFile file,
126 int64_t max_size_bytes) override;
127 void StopRtcEventLog() override;
128
125 void Close() override; 129 void Close() override;
126 130
127 // Virtual for unit tests. 131 // Virtual for unit tests.
128 virtual const std::vector<rtc::scoped_refptr<DataChannel>>& 132 virtual const std::vector<rtc::scoped_refptr<DataChannel>>&
129 sctp_data_channels() const { 133 sctp_data_channels() const {
130 return sctp_data_channels_; 134 return sctp_data_channels_;
131 }; 135 };
132 136
133 protected: 137 protected:
134 ~PeerConnection() override; 138 ~PeerConnection() override;
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 TrackInfos* GetRemoteTracks(cricket::MediaType media_type); 326 TrackInfos* GetRemoteTracks(cricket::MediaType media_type);
323 TrackInfos* GetLocalTracks(cricket::MediaType media_type); 327 TrackInfos* GetLocalTracks(cricket::MediaType media_type);
324 const TrackInfo* FindTrackInfo(const TrackInfos& infos, 328 const TrackInfo* FindTrackInfo(const TrackInfos& infos,
325 const std::string& stream_label, 329 const std::string& stream_label,
326 const std::string track_id) const; 330 const std::string track_id) const;
327 331
328 // Returns the specified SCTP DataChannel in sctp_data_channels_, 332 // Returns the specified SCTP DataChannel in sctp_data_channels_,
329 // or nullptr if not found. 333 // or nullptr if not found.
330 DataChannel* FindDataChannelBySid(int sid) const; 334 DataChannel* FindDataChannelBySid(int sid) const;
331 335
336 // Starts recording an Rtc EventLog using the supplied platform file.
337 // This function should only be called from the worker thread.
338 bool StartRtcEventLog_w(rtc::PlatformFile file, int64_t max_size_bytes);
339 // Starts recording an Rtc EventLog using the supplied platform file.
340 // This function should only be called from the worker thread.
341 void StopRtcEventLog_w();
342
332 // Storing the factory as a scoped reference pointer ensures that the memory 343 // Storing the factory as a scoped reference pointer ensures that the memory
333 // in the PeerConnectionFactoryImpl remains available as long as the 344 // in the PeerConnectionFactoryImpl remains available as long as the
334 // PeerConnection is running. It is passed to PeerConnection as a raw pointer. 345 // PeerConnection is running. It is passed to PeerConnection as a raw pointer.
335 // However, since the reference counting is done in the 346 // However, since the reference counting is done in the
336 // PeerConnectionFactoryInterface all instances created using the raw pointer 347 // PeerConnectionFactoryInterface all instances created using the raw pointer
337 // will refer to the same reference count. 348 // will refer to the same reference count.
338 rtc::scoped_refptr<PeerConnectionFactory> factory_; 349 rtc::scoped_refptr<PeerConnectionFactory> factory_;
339 PeerConnectionObserver* observer_; 350 PeerConnectionObserver* observer_;
340 UMAObserver* uma_observer_; 351 UMAObserver* uma_observer_;
341 SignalingState signaling_state_; 352 SignalingState signaling_state_;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 // because its destruction fires signals (such as VoiceChannelDestroyed) 387 // because its destruction fires signals (such as VoiceChannelDestroyed)
377 // which will trigger some final actions in PeerConnection... 388 // which will trigger some final actions in PeerConnection...
378 rtc::scoped_ptr<WebRtcSession> session_; 389 rtc::scoped_ptr<WebRtcSession> session_;
379 // ... But stats_ depends on session_ so it should be destroyed even earlier. 390 // ... But stats_ depends on session_ so it should be destroyed even earlier.
380 rtc::scoped_ptr<StatsCollector> stats_; 391 rtc::scoped_ptr<StatsCollector> stats_;
381 }; 392 };
382 393
383 } // namespace webrtc 394 } // namespace webrtc
384 395
385 #endif // WEBRTC_API_PEERCONNECTION_H_ 396 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698