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

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

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Hack for injecting a FakeCall, and re-enable TestPacketOptionsAndOnPacketSent test. 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 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 PeerConnectionObserver* observer_; 400 PeerConnectionObserver* observer_;
401 UMAObserver* uma_observer_; 401 UMAObserver* uma_observer_;
402 SignalingState signaling_state_; 402 SignalingState signaling_state_;
403 IceConnectionState ice_connection_state_; 403 IceConnectionState ice_connection_state_;
404 IceGatheringState ice_gathering_state_; 404 IceGatheringState ice_gathering_state_;
405 PeerConnectionInterface::RTCConfiguration configuration_; 405 PeerConnectionInterface::RTCConfiguration configuration_;
406 406
407 std::unique_ptr<cricket::PortAllocator> port_allocator_; 407 std::unique_ptr<cricket::PortAllocator> port_allocator_;
408 // The EventLog needs to outlive the media controller. 408 // The EventLog needs to outlive the media controller.
409 std::unique_ptr<RtcEventLog> event_log_; 409 std::unique_ptr<RtcEventLog> event_log_;
410 std::unique_ptr<MediaControllerInterface> media_controller_;
411 410
412 // One PeerConnection has only one RTCP CNAME. 411 // One PeerConnection has only one RTCP CNAME.
413 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 412 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9
414 std::string rtcp_cname_; 413 std::string rtcp_cname_;
415 414
416 // Streams added via AddStream. 415 // Streams added via AddStream.
417 rtc::scoped_refptr<StreamCollection> local_streams_; 416 rtc::scoped_refptr<StreamCollection> local_streams_;
418 // Streams created as a result of SetRemoteDescription. 417 // Streams created as a result of SetRemoteDescription.
419 rtc::scoped_refptr<StreamCollection> remote_streams_; 418 rtc::scoped_refptr<StreamCollection> remote_streams_;
420 419
(...skipping 19 matching lines...) Expand all
440 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 439 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
441 receivers_; 440 receivers_;
442 std::unique_ptr<WebRtcSession> session_; 441 std::unique_ptr<WebRtcSession> session_;
443 std::unique_ptr<StatsCollector> stats_; 442 std::unique_ptr<StatsCollector> stats_;
444 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; 443 rtc::scoped_refptr<RTCStatsCollector> stats_collector_;
445 }; 444 };
446 445
447 } // namespace webrtc 446 } // namespace webrtc
448 447
449 #endif // WEBRTC_PC_PEERCONNECTION_H_ 448 #endif // WEBRTC_PC_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698