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

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: Another rebase and accompanying changes. Created 4 years, 5 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/src/org/webrtc/PeerConnectionFactory.java ('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
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 void SetRemoteDescription(SetSessionDescriptionObserver* observer, 129 void SetRemoteDescription(SetSessionDescriptionObserver* observer,
130 SessionDescriptionInterface* desc) override; 130 SessionDescriptionInterface* desc) override;
131 bool SetConfiguration( 131 bool SetConfiguration(
132 const PeerConnectionInterface::RTCConfiguration& configuration) override; 132 const PeerConnectionInterface::RTCConfiguration& configuration) override;
133 bool AddIceCandidate(const IceCandidateInterface* candidate) override; 133 bool AddIceCandidate(const IceCandidateInterface* candidate) override;
134 bool RemoveIceCandidates( 134 bool RemoveIceCandidates(
135 const std::vector<cricket::Candidate>& candidates) override; 135 const std::vector<cricket::Candidate>& candidates) override;
136 136
137 void RegisterUMAObserver(UMAObserver* observer) override; 137 void RegisterUMAObserver(UMAObserver* observer) override;
138 138
139 bool StartRtcEventLog(rtc::PlatformFile file,
140 int64_t max_size_bytes) override;
141 void StopRtcEventLog() override;
142
139 void Close() override; 143 void Close() override;
140 144
141 // Virtual for unit tests. 145 // Virtual for unit tests.
142 virtual const std::vector<rtc::scoped_refptr<DataChannel>>& 146 virtual const std::vector<rtc::scoped_refptr<DataChannel>>&
143 sctp_data_channels() const { 147 sctp_data_channels() const {
144 return sctp_data_channels_; 148 return sctp_data_channels_;
145 } 149 }
146 150
147 protected: 151 protected:
148 ~PeerConnection() override; 152 ~PeerConnection() override;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 // Returns the specified SCTP DataChannel in sctp_data_channels_, 357 // Returns the specified SCTP DataChannel in sctp_data_channels_,
354 // or nullptr if not found. 358 // or nullptr if not found.
355 DataChannel* FindDataChannelBySid(int sid) const; 359 DataChannel* FindDataChannelBySid(int sid) const;
356 360
357 // Called when first configuring the port allocator. 361 // Called when first configuring the port allocator.
358 bool InitializePortAllocator_n(const RTCConfiguration& configuration); 362 bool InitializePortAllocator_n(const RTCConfiguration& configuration);
359 // Called when SetConfiguration is called. Only a subset of the configuration 363 // Called when SetConfiguration is called. Only a subset of the configuration
360 // is applied. 364 // is applied.
361 bool ReconfigurePortAllocator_n(const RTCConfiguration& configuration); 365 bool ReconfigurePortAllocator_n(const RTCConfiguration& configuration);
362 366
367 // Starts recording an Rtc EventLog using the supplied platform file.
368 // This function should only be called from the worker thread.
369 bool StartRtcEventLog_w(rtc::PlatformFile file, int64_t max_size_bytes);
370 // Starts recording an Rtc EventLog using the supplied platform file.
371 // This function should only be called from the worker thread.
372 void StopRtcEventLog_w();
373
363 // Storing the factory as a scoped reference pointer ensures that the memory 374 // Storing the factory as a scoped reference pointer ensures that the memory
364 // in the PeerConnectionFactoryImpl remains available as long as the 375 // in the PeerConnectionFactoryImpl remains available as long as the
365 // PeerConnection is running. It is passed to PeerConnection as a raw pointer. 376 // PeerConnection is running. It is passed to PeerConnection as a raw pointer.
366 // However, since the reference counting is done in the 377 // However, since the reference counting is done in the
367 // PeerConnectionFactoryInterface all instances created using the raw pointer 378 // PeerConnectionFactoryInterface all instances created using the raw pointer
368 // will refer to the same reference count. 379 // will refer to the same reference count.
369 rtc::scoped_refptr<PeerConnectionFactory> factory_; 380 rtc::scoped_refptr<PeerConnectionFactory> factory_;
370 PeerConnectionObserver* observer_; 381 PeerConnectionObserver* observer_;
371 UMAObserver* uma_observer_; 382 UMAObserver* uma_observer_;
372 SignalingState signaling_state_; 383 SignalingState signaling_state_;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 420 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
410 receivers_; 421 receivers_;
411 422
412 std::unique_ptr<WebRtcSession> session_; 423 std::unique_ptr<WebRtcSession> session_;
413 std::unique_ptr<StatsCollector> stats_; 424 std::unique_ptr<StatsCollector> stats_;
414 }; 425 };
415 426
416 } // namespace webrtc 427 } // namespace webrtc
417 428
418 #endif // WEBRTC_API_PEERCONNECTION_H_ 429 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/java/src/org/webrtc/PeerConnectionFactory.java ('k') | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698