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

Side by Side Diff: webrtc/ortc/rtptransportcontrolleradapter.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/BUILD.gn ('k') | webrtc/ortc/rtptransportcontrolleradapter.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 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 rtc::Thread* worker_thread_; 188 rtc::Thread* worker_thread_;
189 // |transport_proxies_| and |inner_audio_transport_|/|inner_audio_transport_| 189 // |transport_proxies_| and |inner_audio_transport_|/|inner_audio_transport_|
190 // are somewhat redundant, but the latter are only set when 190 // are somewhat redundant, but the latter are only set when
191 // RtpSenders/RtpReceivers are attached to the transport. 191 // RtpSenders/RtpReceivers are attached to the transport.
192 std::vector<RtpTransportInterface*> transport_proxies_; 192 std::vector<RtpTransportInterface*> transport_proxies_;
193 RtpTransportInterface* inner_audio_transport_ = nullptr; 193 RtpTransportInterface* inner_audio_transport_ = nullptr;
194 RtpTransportInterface* inner_video_transport_ = nullptr; 194 RtpTransportInterface* inner_video_transport_ = nullptr;
195 const cricket::MediaConfig media_config_; 195 const cricket::MediaConfig media_config_;
196 cricket::ChannelManager* channel_manager_; 196 cricket::ChannelManager* channel_manager_;
197 webrtc::RtcEventLog* event_log_; 197 webrtc::RtcEventLog* event_log_;
198 std::unique_ptr<RtpTransportControllerSendInterface>
199 rtp_transport_controller_send_;
198 std::unique_ptr<Call> call_; 200 std::unique_ptr<Call> call_;
199 201
200 // BaseChannel takes content descriptions as input, so we store them here 202 // BaseChannel takes content descriptions as input, so we store them here
201 // such that they can be updated when a new RtpSenderAdapter/ 203 // such that they can be updated when a new RtpSenderAdapter/
202 // RtpReceiverAdapter attaches itself. 204 // RtpReceiverAdapter attaches itself.
203 cricket::AudioContentDescription local_audio_description_; 205 cricket::AudioContentDescription local_audio_description_;
204 cricket::AudioContentDescription remote_audio_description_; 206 cricket::AudioContentDescription remote_audio_description_;
205 cricket::VideoContentDescription local_video_description_; 207 cricket::VideoContentDescription local_video_description_;
206 cricket::VideoContentDescription remote_video_description_; 208 cricket::VideoContentDescription remote_video_description_;
207 cricket::VoiceChannel* voice_channel_ = nullptr; 209 cricket::VoiceChannel* voice_channel_ = nullptr;
208 cricket::VideoChannel* video_channel_ = nullptr; 210 cricket::VideoChannel* video_channel_ = nullptr;
209 bool have_audio_sender_ = false; 211 bool have_audio_sender_ = false;
210 bool have_video_sender_ = false; 212 bool have_video_sender_ = false;
211 bool have_audio_receiver_ = false; 213 bool have_audio_receiver_ = false;
212 bool have_video_receiver_ = false; 214 bool have_video_receiver_ = false;
213 215
214 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpTransportControllerAdapter); 216 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpTransportControllerAdapter);
215 }; 217 };
216 218
217 } // namespace webrtc 219 } // namespace webrtc
218 220
219 #endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_ 221 #endif // WEBRTC_ORTC_RTPTRANSPORTCONTROLLERADAPTER_H_
OLDNEW
« no previous file with comments | « webrtc/ortc/BUILD.gn ('k') | webrtc/ortc/rtptransportcontrolleradapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698