commit a307c3371987a864a4f066b84f9ffb8ab803b41f
author James Dong <jdong@google.com> Tue Jun 14 17:01:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 17:01:11 2011 -0700
tree 0de544f6db37207980d1bbdea9a38395a002cec8
parent b432603d711cd504d0de62f7fbb095b90c9a4283
parent 1fc87828715ef5cda402f1960231621672f91513

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

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;
             }
         }