From 740e6b339a070bd571a559f6d7aee4c604fd4c5e Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Wed, 30 Apr 2014 15:33:45 +0000 Subject: [PATCH] (Auto)update libjingle 65843899-> 65880186 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6029 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 1b8fabcdf2..4762c57dca 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -294,12 +294,8 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer { if (renderer_ == NULL) { return 0; } -#ifdef USE_WEBRTC_DEV_BRANCH - int64 capture_time_ns = ntp_time_ms * -#else // Convert 90K rtp timestamp to ns timestamp. - int64 capture_time_ns = (time_stamp / 90) * -#endif + int64 rtp_time_stamp_in_ns = (time_stamp / 90) * talk_base::kNumNanosecsPerMillisec; // Convert milisecond render time to ns timestamp. int64 render_time_stamp_in_ns = render_time * @@ -308,10 +304,10 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer { // and the render timestamp as the VideoFrame elapsed_time. if (handle == NULL) { return DeliverBufferFrame(buffer, buffer_size, render_time_stamp_in_ns, - capture_time_ns); + rtp_time_stamp_in_ns); } else { return DeliverTextureFrame(handle, render_time_stamp_in_ns, - capture_time_ns); + rtp_time_stamp_in_ns); } }