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

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

Issue 1333483002: Wire up PacketTime to ReceiveStreams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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_send_stream_tests.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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 } 279 }
280 280
281 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const { 281 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const {
282 return stats_proxy_->GetStats(); 282 return stats_proxy_->GetStats();
283 } 283 }
284 284
285 bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) { 285 bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) {
286 return vie_channel_->ReceivedRTCPPacket(packet, length) == 0; 286 return vie_channel_->ReceivedRTCPPacket(packet, length) == 0;
287 } 287 }
288 288
289 bool VideoReceiveStream::DeliverRtp(const uint8_t* packet, size_t length) { 289 bool VideoReceiveStream::DeliverRtp(const uint8_t* packet,
290 return vie_channel_->ReceivedRTPPacket(packet, length, PacketTime()) == 0; 290 size_t length,
291 const PacketTime& packet_time) {
292 return vie_channel_->ReceivedRTPPacket(packet, length, packet_time) == 0;
291 } 293 }
292 294
293 void VideoReceiveStream::FrameCallback(VideoFrame* video_frame) { 295 void VideoReceiveStream::FrameCallback(VideoFrame* video_frame) {
294 stats_proxy_->OnDecodedFrame(); 296 stats_proxy_->OnDecodedFrame();
295 297
296 // Post processing is not supported if the frame is backed by a texture. 298 // Post processing is not supported if the frame is backed by a texture.
297 if (video_frame->native_handle() == NULL) { 299 if (video_frame->native_handle() == NULL) {
298 if (config_.pre_render_callback) 300 if (config_.pre_render_callback)
299 config_.pre_render_callback->FrameCallback(video_frame); 301 config_.pre_render_callback->FrameCallback(video_frame);
300 } 302 }
(...skipping 27 matching lines...) Expand all
328 case newapi::kRtcpCompound: 330 case newapi::kRtcpCompound:
329 vie_channel_->SetRTCPMode(kRtcpCompound); 331 vie_channel_->SetRTCPMode(kRtcpCompound);
330 break; 332 break;
331 case newapi::kRtcpReducedSize: 333 case newapi::kRtcpReducedSize:
332 vie_channel_->SetRTCPMode(kRtcpNonCompound); 334 vie_channel_->SetRTCPMode(kRtcpNonCompound);
333 break; 335 break;
334 } 336 }
335 } 337 }
336 } // namespace internal 338 } // namespace internal
337 } // namespace webrtc 339 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_send_stream_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698