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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 2088953002: Add cricket::VideoFrame::frame_id() and set it to RTP timestamp. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 4 years, 4 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/media/base/videoframefactory.cc ('k') | webrtc/media/engine/webrtcvideoframe.h » ('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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 2451 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 estimated_remote_start_ntp_time_ms_ = frame.ntp_time_ms() - elapsed_time_ms; 2462 estimated_remote_start_ntp_time_ms_ = frame.ntp_time_ms() - elapsed_time_ms;
2463 2463
2464 if (sink_ == NULL) { 2464 if (sink_ == NULL) {
2465 LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoSink."; 2465 LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoSink.";
2466 return; 2466 return;
2467 } 2467 }
2468 2468
2469 last_width_ = frame.width(); 2469 last_width_ = frame.width();
2470 last_height_ = frame.height(); 2470 last_height_ = frame.height();
2471 2471
2472 const WebRtcVideoFrame render_frame( 2472 WebRtcVideoFrame render_frame(
2473 frame.video_frame_buffer(), frame.rotation(), 2473 frame.video_frame_buffer(), frame.rotation(),
2474 frame.render_time_ms() * rtc::kNumNanosecsPerMicrosec); 2474 frame.render_time_ms() * rtc::kNumNanosecsPerMicrosec, frame.timestamp());
2475 sink_->OnFrame(render_frame); 2475 sink_->OnFrame(render_frame);
2476 } 2476 }
2477 2477
2478 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const { 2478 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const {
2479 return default_stream_; 2479 return default_stream_;
2480 } 2480 }
2481 2481
2482 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetSink( 2482 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetSink(
2483 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) { 2483 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
2484 rtc::CritScope crit(&sink_lock_); 2484 rtc::CritScope crit(&sink_lock_);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2651 rtx_mapping[video_codecs[i].codec.id] != 2651 rtx_mapping[video_codecs[i].codec.id] !=
2652 fec_settings.red_payload_type) { 2652 fec_settings.red_payload_type) {
2653 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2653 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2654 } 2654 }
2655 } 2655 }
2656 2656
2657 return video_codecs; 2657 return video_codecs;
2658 } 2658 }
2659 2659
2660 } // namespace cricket 2660 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/base/videoframefactory.cc ('k') | webrtc/media/engine/webrtcvideoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698