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

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

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Convert ViERemb tests to PacketRouter tests. Created 3 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
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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 return codec; 166 return codec;
167 } 167 }
168 } // namespace 168 } // namespace
169 169
170 namespace internal { 170 namespace internal {
171 171
172 VideoReceiveStream::VideoReceiveStream(int num_cpu_cores, 172 VideoReceiveStream::VideoReceiveStream(int num_cpu_cores,
173 PacketRouter* packet_router, 173 PacketRouter* packet_router,
174 VideoReceiveStream::Config config, 174 VideoReceiveStream::Config config,
175 ProcessThread* process_thread, 175 ProcessThread* process_thread,
176 CallStats* call_stats, 176 CallStats* call_stats)
177 VieRemb* remb)
178 : transport_adapter_(config.rtcp_send_transport), 177 : transport_adapter_(config.rtcp_send_transport),
179 config_(std::move(config)), 178 config_(std::move(config)),
180 num_cpu_cores_(num_cpu_cores), 179 num_cpu_cores_(num_cpu_cores),
181 process_thread_(process_thread), 180 process_thread_(process_thread),
182 clock_(Clock::GetRealTimeClock()), 181 clock_(Clock::GetRealTimeClock()),
183 decode_thread_(&DecodeThreadFunction, 182 decode_thread_(&DecodeThreadFunction,
184 this, 183 this,
185 "DecodingThread", 184 "DecodingThread",
186 rtc::kHighestPriority), 185 rtc::kHighestPriority),
187 call_stats_(call_stats), 186 call_stats_(call_stats),
188 timing_(new VCMTiming(clock_)), 187 timing_(new VCMTiming(clock_)),
189 video_receiver_(clock_, nullptr, this, timing_.get(), this, this), 188 video_receiver_(clock_, nullptr, this, timing_.get(), this, this),
190 stats_proxy_(&config_, clock_), 189 stats_proxy_(&config_, clock_),
191 rtp_stream_receiver_(&transport_adapter_, 190 rtp_stream_receiver_(&transport_adapter_,
192 call_stats_->rtcp_rtt_stats(), 191 call_stats_->rtcp_rtt_stats(),
193 packet_router, 192 packet_router,
194 remb,
195 &config_, 193 &config_,
196 &stats_proxy_, 194 &stats_proxy_,
197 process_thread_, 195 process_thread_,
198 this, // NackSender 196 this, // NackSender
199 this, // KeyFrameRequestSender 197 this, // KeyFrameRequestSender
200 this, // OnCompleteFrameCallback 198 this, // OnCompleteFrameCallback
201 timing_.get()), 199 timing_.get()),
202 rtp_stream_sync_(this) { 200 rtp_stream_sync_(this) {
203 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString(); 201 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
204 202
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 RTC_DCHECK_EQ(res, video_coding::FrameBuffer::ReturnReason::kTimeout); 507 RTC_DCHECK_EQ(res, video_coding::FrameBuffer::ReturnReason::kTimeout);
510 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs 508 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
511 << " ms, requesting keyframe."; 509 << " ms, requesting keyframe.";
512 RequestKeyFrame(); 510 RequestKeyFrame();
513 } 511 }
514 512
515 return true; 513 return true;
516 } 514 }
517 } // namespace internal 515 } // namespace internal
518 } // namespace webrtc 516 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698