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 | 113543c909baadb911cfda6acef056137e16f191 (patch) | |
| tree | 0f6ff4a91f2fb3bd1e988f0d0c876878aba9a065 /media | |
| parent | 805bad6505847e69e1c3b2a5518f29bca5050bc6 (diff) | |
| parent | 21663e5dc761c4bfdb99e348e04b2ce1d1d9214c (diff) | |
| download | frameworks_base-113543c909baadb911cfda6acef056137e16f191.zip frameworks_base-113543c909baadb911cfda6acef056137e16f191.tar.gz frameworks_base-113543c909baadb911cfda6acef056137e16f191.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; } } |