generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bug in spatial_resampler where we should set the timestamp after Scale.

Browse Source 
TEST=try bots
BUG=1069

Review URL: https://webrtc-codereview.appspot.com/936018

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3061 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2012-11-07 23:37:41 +00:00
parent 12454028bc
commit 206532e6e2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_processing/main/source/spatial_resampler.cc
View File

@ -82,12 +82,13 @@ VPMSimpleSpatialResampler::ResampleFrame(const I420VideoFrame& inFrame,
if (retVal < 0) if (retVal < 0)
return retVal; return retVal;
// Setting time parameters to the output frame - all the rest will be retVal = _scaler.Scale(inFrame, outFrame);
// set by the scaler.
// Setting time parameters to the output frame.
// Timestamp will be reset in Scale call above, so we should set it after.
outFrame->set_timestamp(inFrame.timestamp()); outFrame->set_timestamp(inFrame.timestamp());
outFrame->set_render_time_ms(inFrame.render_time_ms()); outFrame->set_render_time_ms(inFrame.render_time_ms());
retVal = _scaler.Scale(inFrame, outFrame);
if (retVal == 0) if (retVal == 0)
return VPM_OK; return VPM_OK;
else else