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

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, 6 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) 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 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after
2425 estimated_remote_start_ntp_time_ms_ = frame.ntp_time_ms() - elapsed_time_ms; 2425 estimated_remote_start_ntp_time_ms_ = frame.ntp_time_ms() - elapsed_time_ms;
2426 2426
2427 if (sink_ == NULL) { 2427 if (sink_ == NULL) {
2428 LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoSink."; 2428 LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoSink.";
2429 return; 2429 return;
2430 } 2430 }
2431 2431
2432 last_width_ = frame.width(); 2432 last_width_ = frame.width();
2433 last_height_ = frame.height(); 2433 last_height_ = frame.height();
2434 2434
2435 const WebRtcVideoFrame render_frame( 2435 WebRtcVideoFrame render_frame(
nisse-webrtc 2016/06/22 07:46:36 Why drop const?
Sergey Ulanov 2016/06/22 21:22:30 I just don't think it's useful there, but please l
2436 frame.video_frame_buffer(), frame.rotation(), 2436 frame.video_frame_buffer(), frame.rotation(),
2437 frame.render_time_ms() * rtc::kNumNanosecsPerMicrosec); 2437 frame.render_time_ms() * rtc::kNumNanosecsPerMicrosec, frame.timestamp());
2438 sink_->OnFrame(render_frame); 2438 sink_->OnFrame(render_frame);
2439 } 2439 }
2440 2440
2441 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const { 2441 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const {
2442 return default_stream_; 2442 return default_stream_;
2443 } 2443 }
2444 2444
2445 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetSink( 2445 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetSink(
2446 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) { 2446 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
2447 rtc::CritScope crit(&sink_lock_); 2447 rtc::CritScope crit(&sink_lock_);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2614 rtx_mapping[video_codecs[i].codec.id] != 2614 rtx_mapping[video_codecs[i].codec.id] !=
2615 fec_settings.red_payload_type) { 2615 fec_settings.red_payload_type) {
2616 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2616 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2617 } 2617 }
2618 } 2618 }
2619 2619
2620 return video_codecs; 2620 return video_codecs;
2621 } 2621 }
2622 2622
2623 } // namespace cricket 2623 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698