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

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

Issue 1671893002: Remove ViEChannel calls for VideoReceiveStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove number_of_cores_ Created 4 years, 10 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 (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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 const std::vector<uint32_t>& ssrcs = config.rtp.ssrcs; 163 const std::vector<uint32_t>& ssrcs = config.rtp.ssrcs;
164 164
165 vie_encoder_.reset(new ViEEncoder( 165 vie_encoder_.reset(new ViEEncoder(
166 num_cpu_cores, module_process_thread_, &stats_proxy_, 166 num_cpu_cores, module_process_thread_, &stats_proxy_,
167 config.pre_encode_callback, &overuse_detector_, 167 config.pre_encode_callback, &overuse_detector_,
168 congestion_controller_->pacer(), &payload_router_, bitrate_allocator)); 168 congestion_controller_->pacer(), &payload_router_, bitrate_allocator));
169 vcm_ = vie_encoder_->vcm(); 169 vcm_ = vie_encoder_->vcm();
170 RTC_CHECK(vie_encoder_->Init()); 170 RTC_CHECK(vie_encoder_->Init());
171 171
172 vie_channel_.reset(new ViEChannel( 172 vie_channel_.reset(new ViEChannel(
173 num_cpu_cores, config.send_transport, module_process_thread_, 173 config.send_transport, module_process_thread_, &payload_router_, nullptr,
174 &payload_router_, nullptr, encoder_feedback_->GetRtcpIntraFrameObserver(), 174 encoder_feedback_->GetRtcpIntraFrameObserver(),
175 congestion_controller_->GetBitrateController() 175 congestion_controller_->GetBitrateController()
176 ->CreateRtcpBandwidthObserver(), 176 ->CreateRtcpBandwidthObserver(),
177 transport_feedback_observer, 177 transport_feedback_observer,
178 congestion_controller_->GetRemoteBitrateEstimator(false), 178 congestion_controller_->GetRemoteBitrateEstimator(false),
179 call_stats_->rtcp_rtt_stats(), congestion_controller_->pacer(), 179 call_stats_->rtcp_rtt_stats(), congestion_controller_->pacer(),
180 congestion_controller_->packet_router(), ssrcs.size(), true)); 180 congestion_controller_->packet_router(), ssrcs.size(), true));
181 RTC_CHECK(vie_channel_->Init() == 0); 181 RTC_CHECK(vie_channel_->Init() == 0);
182 182
183 vcm_->RegisterProtectionCallback(vie_channel_->vcm_protection_callback()); 183 vcm_->RegisterProtectionCallback(vie_channel_->vcm_protection_callback());
184 184
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 vie_encoder_->SetSsrcs(used_ssrcs); 603 vie_encoder_->SetSsrcs(used_ssrcs);
604 604
605 // Restart the media flow 605 // Restart the media flow
606 vie_encoder_->Restart(); 606 vie_encoder_->Restart();
607 607
608 return true; 608 return true;
609 } 609 }
610 610
611 } // namespace internal 611 } // namespace internal
612 } // namespace webrtc 612 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698