diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-23 13:03:45 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-23 13:03:45 +0000 |
| commit | c78d40d6dd3dad0bd06535141db6e5e63f16dc7a (patch) | |
| tree | 9e33740d246144e27f58c8ca57aecbb67a6bb550 /video_engine/vie_capturer.cc | |
| parent | f3f2dba8abe750f7649fd3d8567847b0076f834a (diff) | |
| download | webrtc-c78d40d6dd3dad0bd06535141db6e5e63f16dc7a.tar.gz | |
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
Diffstat (limited to 'video_engine/vie_capturer.cc')
| -rw-r--r-- | video_engine/vie_capturer.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/video_engine/vie_capturer.cc b/video_engine/vie_capturer.cc index 65159a1d..f037dc82 100644 --- a/video_engine/vie_capturer.cc +++ b/video_engine/vie_capturer.cc @@ -337,6 +337,9 @@ int ViECapturer::IncomingFrameI420(const ViEVideoFrameI420& video_frame, void ViECapturer::SwapFrame(I420VideoFrame* frame) { external_capture_module_->IncomingI420VideoFrame(frame, frame->render_time_ms()); + frame->set_timestamp(0); + frame->set_ntp_time_ms(0); + frame->set_render_time_ms(0); } void ViECapturer::OnIncomingCapturedFrame(const int32_t capture_id, |