summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-06-13 18:42:24 -0700
committerJames Dong <jdong@google.com>2011-06-13 18:42:24 -0700
commit1fc87828715ef5cda402f1960231621672f91513 (patch)
treebf59d53470889d5e5356c89149bcca89c0d18799 /media
parentafcedc9e6f17d8213d9bd8f6c36643dcc816d0ef (diff)
downloadframeworks_av-1fc87828715ef5cda402f1960231621672f91513.zip
frameworks_av-1fc87828715ef5cda402f1960231621672f91513.tar.gz
frameworks_av-1fc87828715ef5cda402f1960231621672f91513.tar.bz2
Enforce the rule that the timestamp from timelapse video source monotically increases
Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
Diffstat (limited to 'media')
-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 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;
}
}