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

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

Issue 1864313003: Move Ownership of RtpModules to VideoSendStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 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/video/payload_router_unittest.cc ('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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 vcm_(VideoCodingModule::Create(clock_, 165 vcm_(VideoCodingModule::Create(clock_,
166 nullptr, 166 nullptr,
167 nullptr, 167 nullptr,
168 this, 168 this,
169 this, 169 this,
170 this)), 170 this)),
171 incoming_video_stream_(0, config.disable_prerenderer_smoothing), 171 incoming_video_stream_(0, config.disable_prerenderer_smoothing),
172 stats_proxy_(config_, clock_), 172 stats_proxy_(config_, clock_),
173 vie_channel_(&transport_adapter_, 173 vie_channel_(&transport_adapter_,
174 process_thread, 174 process_thread,
175 nullptr,
176 vcm_.get(), 175 vcm_.get(),
177 nullptr,
178 nullptr,
179 nullptr,
180 congestion_controller_->GetRemoteBitrateEstimator( 176 congestion_controller_->GetRemoteBitrateEstimator(
181 UseSendSideBwe(config_)), 177 UseSendSideBwe(config_)),
182 call_stats_->rtcp_rtt_stats(), 178 call_stats_->rtcp_rtt_stats(),
183 congestion_controller_->pacer(), 179 congestion_controller_->pacer(),
184 congestion_controller_->packet_router(), 180 congestion_controller_->packet_router()),
185 1,
186 false),
187 vie_receiver_(vie_channel_.vie_receiver()), 181 vie_receiver_(vie_channel_.vie_receiver()),
188 vie_sync_(vcm_.get()), 182 vie_sync_(vcm_.get()),
189 rtp_rtcp_(vie_channel_.rtp_rtcp().front()) { 183 rtp_rtcp_(vie_channel_.rtp_rtcp()) {
190 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString(); 184 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
191 185
192 RTC_DCHECK(process_thread_); 186 RTC_DCHECK(process_thread_);
193 RTC_DCHECK(congestion_controller_); 187 RTC_DCHECK(congestion_controller_);
194 RTC_DCHECK(call_stats_); 188 RTC_DCHECK(call_stats_);
195 RTC_DCHECK(remb_); 189 RTC_DCHECK(remb_);
196 RTC_CHECK(vie_channel_.Init() == 0); 190 RTC_CHECK(vie_channel_.Init() == 0);
197 191
198 // Register the channel to receive stats updates. 192 // Register the channel to receive stats updates.
199 call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver()); 193 call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver());
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 const std::vector<uint16_t>& sequence_numbers) { 453 const std::vector<uint16_t>& sequence_numbers) {
460 rtp_rtcp_->SendNack(sequence_numbers); 454 rtp_rtcp_->SendNack(sequence_numbers);
461 } 455 }
462 456
463 void VideoReceiveStream::RequestKeyFrame() { 457 void VideoReceiveStream::RequestKeyFrame() {
464 rtp_rtcp_->RequestKeyFrame(); 458 rtp_rtcp_->RequestKeyFrame();
465 } 459 }
466 460
467 } // namespace internal 461 } // namespace internal
468 } // namespace webrtc 462 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/payload_router_unittest.cc ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698