Revert "Revert "Remove VideoSendStreamInput::PutFrame.""
This reverts commit r6230 to re-land r6229.
ViECapturer::SwapFrame now resets timestamps.
BUG=
R=stefan@webrtc.org
TBR=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13529004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6231 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc
index 7cdb353..ced0b69 100644
--- a/video/video_send_stream.cc
+++ b/video/video_send_stream.cc
@@ -280,24 +280,12 @@
rtp_rtcp_->Release();
}
-void VideoSendStream::PutFrame(const I420VideoFrame& frame) {
- input_frame_.CopyFrame(frame);
- SwapFrame(&input_frame_);
-}
-
void VideoSendStream::SwapFrame(I420VideoFrame* frame) {
- // TODO(pbos): Warn if frame is "too far" into the future, or too old. This
- // would help detect if frame's being used without NTP.
- // TO REVIEWER: Is there any good check for this? Should it be
- // skipped?
- if (frame != &input_frame_)
- input_frame_.SwapFrame(frame);
-
// TODO(pbos): Local rendering should not be done on the capture thread.
if (config_.local_renderer != NULL)
- config_.local_renderer->RenderFrame(input_frame_, 0);
+ config_.local_renderer->RenderFrame(*frame, 0);
- external_capture_->SwapFrame(&input_frame_);
+ external_capture_->SwapFrame(frame);
}
VideoSendStreamInput* VideoSendStream::Input() { return this; }