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

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

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Revert DCHECK addition. Created 3 years, 7 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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 int candidate_pool_size, 383 int candidate_pool_size,
384 bool prune_turn_ports); 384 bool prune_turn_ports);
385 385
386 // Starts recording an Rtc EventLog using the supplied platform file. 386 // Starts recording an Rtc EventLog using the supplied platform file.
387 // This function should only be called from the worker thread. 387 // This function should only be called from the worker thread.
388 bool StartRtcEventLog_w(rtc::PlatformFile file, int64_t max_size_bytes); 388 bool StartRtcEventLog_w(rtc::PlatformFile file, int64_t max_size_bytes);
389 // Starts recording an Rtc EventLog using the supplied platform file. 389 // Starts recording an Rtc EventLog using the supplied platform file.
390 // This function should only be called from the worker thread. 390 // This function should only be called from the worker thread.
391 void StopRtcEventLog_w(); 391 void StopRtcEventLog_w();
392 392
393 // Creates the |*call_| object. Must only be called from the worker thread.
394 void CreateCall_w();
395
393 // Storing the factory as a scoped reference pointer ensures that the memory 396 // Storing the factory as a scoped reference pointer ensures that the memory
394 // in the PeerConnectionFactoryImpl remains available as long as the 397 // in the PeerConnectionFactoryImpl remains available as long as the
395 // PeerConnection is running. It is passed to PeerConnection as a raw pointer. 398 // PeerConnection is running. It is passed to PeerConnection as a raw pointer.
396 // However, since the reference counting is done in the 399 // However, since the reference counting is done in the
397 // PeerConnectionFactoryInterface all instances created using the raw pointer 400 // PeerConnectionFactoryInterface all instances created using the raw pointer
398 // will refer to the same reference count. 401 // will refer to the same reference count.
399 rtc::scoped_refptr<PeerConnectionFactory> factory_; 402 rtc::scoped_refptr<PeerConnectionFactory> factory_;
400 PeerConnectionObserver* observer_; 403 PeerConnectionObserver* observer_;
401 UMAObserver* uma_observer_; 404 UMAObserver* uma_observer_;
402 SignalingState signaling_state_; 405 SignalingState signaling_state_;
403 IceConnectionState ice_connection_state_; 406 IceConnectionState ice_connection_state_;
404 IceGatheringState ice_gathering_state_; 407 IceGatheringState ice_gathering_state_;
405 PeerConnectionInterface::RTCConfiguration configuration_; 408 PeerConnectionInterface::RTCConfiguration configuration_;
406 409
407 std::unique_ptr<cricket::PortAllocator> port_allocator_; 410 std::unique_ptr<cricket::PortAllocator> port_allocator_;
408 // The EventLog needs to outlive the media controller. 411 // The EventLog needs to outlive |call_|.
409 std::unique_ptr<RtcEventLog> event_log_; 412 std::unique_ptr<RtcEventLog> event_log_;
410 std::unique_ptr<MediaControllerInterface> media_controller_;
411 413
412 // One PeerConnection has only one RTCP CNAME. 414 // One PeerConnection has only one RTCP CNAME.
413 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 415 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9
414 std::string rtcp_cname_; 416 std::string rtcp_cname_;
415 417
416 // Streams added via AddStream. 418 // Streams added via AddStream.
417 rtc::scoped_refptr<StreamCollection> local_streams_; 419 rtc::scoped_refptr<StreamCollection> local_streams_;
418 // Streams created as a result of SetRemoteDescription. 420 // Streams created as a result of SetRemoteDescription.
419 rtc::scoped_refptr<StreamCollection> remote_streams_; 421 rtc::scoped_refptr<StreamCollection> remote_streams_;
420 422
(...skipping 12 matching lines...) Expand all
433 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_; 435 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
434 436
435 bool remote_peer_supports_msid_ = false; 437 bool remote_peer_supports_msid_ = false;
436 438
437 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> 439 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
438 senders_; 440 senders_;
439 std::vector< 441 std::vector<
440 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 442 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
441 receivers_; 443 receivers_;
442 std::unique_ptr<WebRtcSession> session_; 444 std::unique_ptr<WebRtcSession> session_;
445 std::unique_ptr<Call> call_;
443 std::unique_ptr<StatsCollector> stats_; 446 std::unique_ptr<StatsCollector> stats_;
444 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; 447 rtc::scoped_refptr<RTCStatsCollector> stats_collector_;
445 }; 448 };
446 449
447 } // namespace webrtc 450 } // namespace webrtc
448 451
449 #endif // WEBRTC_PC_PEERCONNECTION_H_ 452 #endif // WEBRTC_PC_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698