diff options
| author | James Dong <jdong@google.com> | 2011-06-14 17:01:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-14 17:01:11 -0700 |
| commit | a307c3371987a864a4f066b84f9ffb8ab803b41f (patch) | |
| tree | 0de544f6db37207980d1bbdea9a38395a002cec8 /media | |
| parent | b432603d711cd504d0de62f7fbb095b90c9a4283 (diff) | |
| parent | 1fc87828715ef5cda402f1960231621672f91513 (diff) | |
| download | frameworks_av-a307c3371987a864a4f066b84f9ffb8ab803b41f.zip frameworks_av-a307c3371987a864a4f066b84f9ffb8ab803b41f.tar.gz frameworks_av-a307c3371987a864a4f066b84f9ffb8ab803b41f.tar.bz2 | |
Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/CameraSourceTimeLapse.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp index 3689557..cc22574 100644 --- a/media/libstagefright/CameraSourceTimeLapse.cpp +++ b/media/libstagefright/CameraSourceTimeLapse.cpp @@ -486,7 +486,8 @@ bool CameraSourceTimeLapse::skipFrameAndModifyTimeStamp(int64_t *timestampUs) { if (mForceRead) { LOGV("dataCallbackTimestamp timelapse: forced read"); mForceRead = false; - *timestampUs = mLastFrameTimestampUs; + *timestampUs = + mLastFrameTimestampUs + mTimeBetweenTimeLapseVideoFramesUs; return false; } } |