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

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

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Delete obsolete suppression for PacketRouterTest.SendTransportFeedback. 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
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_receive_stream_unittest.cc » ('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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } 166 }
167 } // namespace 167 } // namespace
168 168
169 namespace internal { 169 namespace internal {
170 170
171 VideoReceiveStream::VideoReceiveStream( 171 VideoReceiveStream::VideoReceiveStream(
172 int num_cpu_cores, 172 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, this, "DecodingThread"), 182 decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
184 call_stats_(call_stats), 183 call_stats_(call_stats),
185 timing_(new VCMTiming(clock_)), 184 timing_(new VCMTiming(clock_)),
186 video_receiver_(clock_, nullptr, this, timing_.get(), this, this), 185 video_receiver_(clock_, nullptr, this, timing_.get(), this, this),
187 stats_proxy_(&config_, clock_), 186 stats_proxy_(&config_, clock_),
188 rtp_stream_receiver_(&transport_adapter_, 187 rtp_stream_receiver_(&transport_adapter_,
189 call_stats_->rtcp_rtt_stats(), 188 call_stats_->rtcp_rtt_stats(),
190 packet_router, 189 packet_router,
191 remb,
192 &config_, 190 &config_,
193 &stats_proxy_, 191 &stats_proxy_,
194 process_thread_, 192 process_thread_,
195 this, // NackSender 193 this, // NackSender
196 this, // KeyFrameRequestSender 194 this, // KeyFrameRequestSender
197 this, // OnCompleteFrameCallback 195 this, // OnCompleteFrameCallback
198 timing_.get()), 196 timing_.get()),
199 rtp_stream_sync_(this) { 197 rtp_stream_sync_(this) {
200 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString(); 198 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
201 199
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 rtp_stream_receiver_.FrameDecoded(frame->picture_id); 483 rtp_stream_receiver_.FrameDecoded(frame->picture_id);
486 } else { 484 } else {
487 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs 485 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
488 << " ms, requesting keyframe."; 486 << " ms, requesting keyframe.";
489 RequestKeyFrame(); 487 RequestKeyFrame();
490 } 488 }
491 return true; 489 return true;
492 } 490 }
493 } // namespace internal 491 } // namespace internal
494 } // namespace webrtc 492 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_receive_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698