From 93594b5aa16dbbb0b196f6e181a8ca099d7ab62b Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Wed, 26 Oct 2011 23:47:55 -0700
Subject: Fix a hang issue where the first frame can be dropped for timelapse
 video recording.

Change-Id: I04754f1005a983953a80a659ff13f8762d0e120c
related-to-bug: 5523502
---
 media/libstagefright/CameraSourceTimeLapse.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'media')

diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index 1ba79e5..e4de20a 100644
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -257,6 +257,12 @@ bool CameraSourceTimeLapse::skipFrameAndModifyTimeStamp(int64_t *timestampUs) {
             mForceRead = false;
             *timestampUs =
                 mLastFrameTimestampUs + mTimeBetweenTimeLapseVideoFramesUs;
+
+            // Really make sure that this video recording frame will not be dropped.
+            if (*timestampUs < mStartTimeUs) {
+                LOGI("set timestampUs to start time stamp %lld us", mStartTimeUs);
+                *timestampUs = mStartTimeUs;
+            }
             return false;
         }
     }
-- 
cgit v1.1