summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2011-06-13 18:42:24 -0700
committer James Dong <jdong@google.com> 2011-06-13 18:42:24 -0700
commit21663e5dc761c4bfdb99e348e04b2ce1d1d9214c (patch)
tree0d3b7a4981b0662937c5f4f75a3e4f5110ff2e88
parent622d5441975fa16636d3304d42d27659af14cb49 (diff)
Enforce the rule that the timestamp from timelapse video source monotically increases
Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
-rw-r--r--media/libstagefright/CameraSourceTimeLapse.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index 3689557bbf92..cc2257477071 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;
}
}