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

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

Issue 2880323002: Move ownership of RtpTransportControllerSendInterface from Call to PeerConnection.
Patch Set: Delete shadowing member variables in BitrateEstimatorTest. Created 3 years, 6 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/ortc/rtptransportcontrolleradapter.cc ('k') | webrtc/pc/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 13 matching lines...) Expand all
24 #include "webrtc/pc/rtpsender.h" 24 #include "webrtc/pc/rtpsender.h"
25 #include "webrtc/pc/statscollector.h" 25 #include "webrtc/pc/statscollector.h"
26 #include "webrtc/pc/streamcollection.h" 26 #include "webrtc/pc/streamcollection.h"
27 #include "webrtc/pc/webrtcsession.h" 27 #include "webrtc/pc/webrtcsession.h"
28 28
29 namespace webrtc { 29 namespace webrtc {
30 30
31 class MediaStreamObserver; 31 class MediaStreamObserver;
32 class VideoRtpReceiver; 32 class VideoRtpReceiver;
33 class RtcEventLog; 33 class RtcEventLog;
34 class RtpTransportControllerSendInterface;
34 35
35 // Populates |session_options| from |rtc_options|, and returns true if options 36 // Populates |session_options| from |rtc_options|, and returns true if options
36 // are valid. 37 // are valid.
37 // |session_options|->transport_options map entries must exist in order for 38 // |session_options|->transport_options map entries must exist in order for
38 // them to be populated from |rtc_options|. 39 // them to be populated from |rtc_options|.
39 bool ExtractMediaSessionOptions( 40 bool ExtractMediaSessionOptions(
40 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, 41 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options,
41 bool is_offer, 42 bool is_offer,
42 cricket::MediaSessionOptions* session_options); 43 cricket::MediaSessionOptions* session_options);
43 44
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 TrackInfos local_video_tracks_; 432 TrackInfos local_video_tracks_;
432 433
433 SctpSidAllocator sid_allocator_; 434 SctpSidAllocator sid_allocator_;
434 // label -> DataChannel 435 // label -> DataChannel
435 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_; 436 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_;
436 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_; 437 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_;
437 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_; 438 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
438 439
439 bool remote_peer_supports_msid_ = false; 440 bool remote_peer_supports_msid_ = false;
440 441
442 // TODO(nisse): Should use separate audio and video transports in
443 // the unbundled case. And potentially more than two in the
444 // completely unbundled case.
445 std::unique_ptr<RtpTransportControllerSendInterface>
446 rtp_transport_controller_send_;
447
441 std::unique_ptr<Call> call_; 448 std::unique_ptr<Call> call_;
442 std::unique_ptr<WebRtcSession> session_; 449 std::unique_ptr<WebRtcSession> session_;
443 std::unique_ptr<StatsCollector> stats_; // A pointer is passed to senders_ 450 std::unique_ptr<StatsCollector> stats_; // A pointer is passed to senders_
444 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; 451 rtc::scoped_refptr<RTCStatsCollector> stats_collector_;
445 452
446 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> 453 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
447 senders_; 454 senders_;
448 std::vector< 455 std::vector<
449 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 456 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
450 receivers_; 457 receivers_;
451 }; 458 };
452 459
453 } // namespace webrtc 460 } // namespace webrtc
454 461
455 #endif // WEBRTC_PC_PEERCONNECTION_H_ 462 #endif // WEBRTC_PC_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/ortc/rtptransportcontrolleradapter.cc ('k') | webrtc/pc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698