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

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

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Address nits. 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 172 }
173 } // namespace 173 } // namespace
174 174
175 namespace internal { 175 namespace internal {
176 176
177 VideoReceiveStream::VideoReceiveStream( 177 VideoReceiveStream::VideoReceiveStream(
178 int num_cpu_cores, 178 int num_cpu_cores,
179 PacketRouter* packet_router, 179 PacketRouter* packet_router,
180 VideoReceiveStream::Config config, 180 VideoReceiveStream::Config config,
181 ProcessThread* process_thread, 181 ProcessThread* process_thread,
182 CallStats* call_stats, 182 CallStats* call_stats)
183 VieRemb* remb)
184 : transport_adapter_(config.rtcp_send_transport), 183 : transport_adapter_(config.rtcp_send_transport),
185 config_(std::move(config)), 184 config_(std::move(config)),
186 num_cpu_cores_(num_cpu_cores), 185 num_cpu_cores_(num_cpu_cores),
187 process_thread_(process_thread), 186 process_thread_(process_thread),
188 clock_(Clock::GetRealTimeClock()), 187 clock_(Clock::GetRealTimeClock()),
189 decode_thread_(DecodeThreadFunction, this, "DecodingThread"), 188 decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
190 call_stats_(call_stats), 189 call_stats_(call_stats),
191 timing_(new VCMTiming(clock_)), 190 timing_(new VCMTiming(clock_)),
192 video_receiver_(clock_, nullptr, this, timing_.get(), this, this), 191 video_receiver_(clock_, nullptr, this, timing_.get(), this, this),
193 stats_proxy_(&config_, clock_), 192 stats_proxy_(&config_, clock_),
194 rtp_stream_receiver_(&transport_adapter_, 193 rtp_stream_receiver_(&transport_adapter_,
195 call_stats_->rtcp_rtt_stats(), 194 call_stats_->rtcp_rtt_stats(),
196 packet_router, 195 packet_router,
197 remb,
198 &config_, 196 &config_,
199 &stats_proxy_, 197 &stats_proxy_,
200 process_thread_, 198 process_thread_,
201 this, // NackSender 199 this, // NackSender
202 this, // KeyFrameRequestSender 200 this, // KeyFrameRequestSender
203 this, // OnCompleteFrameCallback 201 this, // OnCompleteFrameCallback
204 timing_.get()), 202 timing_.get()),
205 rtp_stream_sync_(this) { 203 rtp_stream_sync_(this) {
206 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString(); 204 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
207 205
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 rtp_stream_receiver_.FrameDecoded(frame->picture_id); 489 rtp_stream_receiver_.FrameDecoded(frame->picture_id);
492 } else { 490 } else {
493 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs 491 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
494 << " ms, requesting keyframe."; 492 << " ms, requesting keyframe.";
495 RequestKeyFrame(); 493 RequestKeyFrame();
496 } 494 }
497 return true; 495 return true;
498 } 496 }
499 } // namespace internal 497 } // namespace internal
500 } // namespace webrtc 498 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698