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

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

Issue 2681673004: Replace RtpStreamReceiver::DeliverRtp with OnRtpPacket. (Closed)
Patch Set: Change return type of OnRtpPacket from bool to void. Created 3 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
« webrtc/call/call.cc ('K') | « webrtc/video/video_receive_stream.h ('k') | no next file » | 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 void VideoReceiveStream::SignalNetworkState(NetworkState state) { 249 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
250 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 250 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
251 rtp_stream_receiver_.SignalNetworkState(state); 251 rtp_stream_receiver_.SignalNetworkState(state);
252 } 252 }
253 253
254 254
255 bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) { 255 bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) {
256 return rtp_stream_receiver_.DeliverRtcp(packet, length); 256 return rtp_stream_receiver_.DeliverRtcp(packet, length);
257 } 257 }
258 258
259 bool VideoReceiveStream::DeliverRtp(const uint8_t* packet, 259 void VideoReceiveStream::OnRtpPacket(const RtpPacketReceived& packet) {
260 size_t length, 260 rtp_stream_receiver_.OnRtpPacket(packet);
261 const PacketTime& packet_time) {
262 return rtp_stream_receiver_.DeliverRtp(packet, length, packet_time);
263 } 261 }
264 262
265 bool VideoReceiveStream::OnRecoveredPacket(const uint8_t* packet, 263 bool VideoReceiveStream::OnRecoveredPacket(const uint8_t* packet,
266 size_t length) { 264 size_t length) {
267 return rtp_stream_receiver_.OnRecoveredPacket(packet, length); 265 return rtp_stream_receiver_.OnRecoveredPacket(packet, length);
268 } 266 }
269 267
270 void VideoReceiveStream::SetSync(Syncable* audio_syncable) { 268 void VideoReceiveStream::SetSync(Syncable* audio_syncable) {
271 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 269 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
272 rtp_stream_sync_.ConfigureSync(audio_syncable); 270 rtp_stream_sync_.ConfigureSync(audio_syncable);
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs 503 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
506 << " ms, requesting keyframe."; 504 << " ms, requesting keyframe.";
507 RequestKeyFrame(); 505 RequestKeyFrame();
508 } 506 }
509 } else { 507 } else {
510 video_receiver_.Decode(kMaxDecodeWaitTimeMs); 508 video_receiver_.Decode(kMaxDecodeWaitTimeMs);
511 } 509 }
512 } 510 }
513 } // namespace internal 511 } // namespace internal
514 } // namespace webrtc 512 } // namespace webrtc
OLDNEW
« webrtc/call/call.cc ('K') | « webrtc/video/video_receive_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698