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

Side by Side Diff: webrtc/video/video_receive_stream.cc

Issue 2516983004: Move ownership of PacketRouter from CongestionController to Call. (Closed)
Patch Set: Add back packet_router method and 4-argument constructor. Created 4 years 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/video/video_receive_stream.h ('k') | webrtc/video/video_send_stream.h » ('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 (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 return codec; 183 return codec;
184 } 184 }
185 } // namespace 185 } // namespace
186 186
187 namespace internal { 187 namespace internal {
188 188
189 VideoReceiveStream::VideoReceiveStream( 189 VideoReceiveStream::VideoReceiveStream(
190 int num_cpu_cores, 190 int num_cpu_cores,
191 CongestionController* congestion_controller, 191 CongestionController* congestion_controller,
192 PacketRouter* packet_router,
192 VideoReceiveStream::Config config, 193 VideoReceiveStream::Config config,
193 webrtc::VoiceEngine* voice_engine, 194 webrtc::VoiceEngine* voice_engine,
194 ProcessThread* process_thread, 195 ProcessThread* process_thread,
195 CallStats* call_stats, 196 CallStats* call_stats,
196 VieRemb* remb) 197 VieRemb* remb)
197 : transport_adapter_(config.rtcp_send_transport), 198 : transport_adapter_(config.rtcp_send_transport),
198 config_(std::move(config)), 199 config_(std::move(config)),
199 num_cpu_cores_(num_cpu_cores), 200 num_cpu_cores_(num_cpu_cores),
200 process_thread_(process_thread), 201 process_thread_(process_thread),
201 clock_(Clock::GetRealTimeClock()), 202 clock_(Clock::GetRealTimeClock()),
202 decode_thread_(DecodeThreadFunction, this, "DecodingThread"), 203 decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
203 congestion_controller_(congestion_controller), 204 congestion_controller_(congestion_controller),
204 call_stats_(call_stats), 205 call_stats_(call_stats),
205 video_receiver_(clock_, nullptr, this, this, this), 206 video_receiver_(clock_, nullptr, this, this, this),
206 stats_proxy_(&config_, clock_), 207 stats_proxy_(&config_, clock_),
207 timing_(new VCMTiming(clock_)), 208 timing_(new VCMTiming(clock_)),
208 rtp_stream_receiver_( 209 rtp_stream_receiver_(
209 &video_receiver_, 210 &video_receiver_,
210 congestion_controller_->GetRemoteBitrateEstimator( 211 congestion_controller_->GetRemoteBitrateEstimator(
211 UseSendSideBwe(config_)), 212 UseSendSideBwe(config_)),
212 &transport_adapter_, 213 &transport_adapter_,
213 call_stats_->rtcp_rtt_stats(), 214 call_stats_->rtcp_rtt_stats(),
214 congestion_controller_->pacer(), 215 congestion_controller_->pacer(),
215 congestion_controller_->packet_router(), 216 packet_router,
216 remb, 217 remb,
217 &config_, 218 &config_,
218 &stats_proxy_, 219 &stats_proxy_,
219 process_thread_, 220 process_thread_,
220 congestion_controller_->GetRetransmissionRateLimiter(), 221 congestion_controller_->GetRetransmissionRateLimiter(),
221 this, // NackSender 222 this, // NackSender
222 this, // KeyFrameRequestSender 223 this, // KeyFrameRequestSender
223 this, // OnCompleteFrameCallback 224 this, // OnCompleteFrameCallback
224 timing_.get()), 225 timing_.get()),
225 rtp_stream_sync_(&video_receiver_, &rtp_stream_receiver_), 226 rtp_stream_sync_(&video_receiver_, &rtp_stream_receiver_),
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 RequestKeyFrame(); 486 RequestKeyFrame();
486 } 487 }
487 } 488 }
488 489
489 void VideoReceiveStream::RequestKeyFrame() { 490 void VideoReceiveStream::RequestKeyFrame() {
490 rtp_stream_receiver_.RequestKeyFrame(); 491 rtp_stream_receiver_.RequestKeyFrame();
491 } 492 }
492 493
493 } // namespace internal 494 } // namespace internal
494 } // namespace webrtc 495 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698