diff options
| author | perkj@webrtc.org <perkj@webrtc.org> | 2015-03-06 12:37:19 +0000 |
|---|---|---|
| committer | perkj@webrtc.org <perkj@webrtc.org> | 2015-03-06 12:38:22 +0000 |
| commit | bcead305a2f27c30c72c6a3824fdf12f4b83c2eb (patch) | |
| tree | 1ce2b74e44dadabe4945c3abcbefcafc9fd1701b /talk/media/webrtc/webrtcvideoengine2.cc | |
| parent | 75e850e192aabe57b5a376d2127950acfffff7c6 (diff) | |
| download | webrtc-bcead305a2f27c30c72c6a3824fdf12f4b83c2eb.tar.gz | |
Make the entry point for VideoFrames to webrtc const ref I420VideoFrame.
This removes the none const pointer entry and SwapFrame.
Since frames delivered using VideoSendStream no longer use the external capture module, VideoSendStream will not get an incoming framerate callback. VideoSendStream now uses a rtc::RateTracker.
Also, the video engine must ensure that time stamps are always increasing.
With this, time stamps (ntp, render_time and rtp timestamps ) are checked and set in ViECapturer::OnIncomingCapturedFrame
BUG=1128
R=magjed@webrtc.org, mflodman@webrtc.org, pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/46429004
Cr-Commit-Position: refs/heads/master@{#8633}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8633 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/media/webrtc/webrtcvideoengine2.cc')
| -rw-r--r-- | talk/media/webrtc/webrtcvideoengine2.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index af00928004..e6f59d12ef 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -1412,11 +1412,11 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::InputFrame( SetDimensions( video_frame_.width(), video_frame_.height(), capturer->IsScreencast()); - LOG(LS_VERBOSE) << "SwapFrame: " << video_frame_.width() << "x" + LOG(LS_VERBOSE) << "IncomingCapturedFrame: " << video_frame_.width() << "x" << video_frame_.height() << " -> (codec) " << parameters_.encoder_config.streams.back().width << "x" << parameters_.encoder_config.streams.back().height; - stream_->Input()->SwapFrame(&video_frame_); + stream_->Input()->IncomingCapturedFrame(video_frame_); } bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer( @@ -1436,7 +1436,7 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer( CreateBlackFrame(&black_frame, last_dimensions_.width, last_dimensions_.height); - stream_->Input()->SwapFrame(&black_frame); + stream_->Input()->IncomingCapturedFrame(black_frame); } capturer_ = NULL; |