commit 1fc87828715ef5cda402f1960231621672f91513
author James Dong <jdong@google.com> Mon Jun 13 18:42:24 2011 -0700
committer James Dong <jdong@google.com> Mon Jun 13 18:42:24 2011 -0700
tree bf59d53470889d5e5356c89149bcca89c0d18799
parent afcedc9e6f17d8213d9bd8f6c36643dcc816d0ef

Enforce the rule that the timestamp from timelapse video source monotically increases

Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e

media/libstagefright/CameraSourceTimeLapse.cpp

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 @@
             if (mForceRead) {
                 LOGV("dataCallbackTimestamp timelapse: forced read");
                 mForceRead = false;
-                *timestampUs = mLastFrameTimestampUs;
+                *timestampUs =
+                    mLastFrameTimestampUs + mTimeBetweenTimeLapseVideoFramesUs;
                 return false;
             }
         }