admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Auto)update libjingle 65484212-> 65561104

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5978 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-04-25 00:18:27 +00:00
parent cc1ba15fe7
commit 2b93402e36
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -294,8 +294,12 @@ 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 rtp_time_stamp_in_ns = (time_stamp / 90) *
int64 capture_time_ns = (time_stamp / 90) *
#endif
talk_base::kNumNanosecsPerMillisec;
// Convert milisecond render time to ns timestamp.
int64 render_time_stamp_in_ns = render_time *
@ -304,10 +308,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,
rtp_time_stamp_in_ns);
capture_time_ns);
} else {
return DeliverTextureFrame(handle, render_time_stamp_in_ns,
rtp_time_stamp_in_ns);
capture_time_ns);
}
}