Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1

James Dong · Android (Google) Code Review · commit ee7ebb3257d9 · 2011-11-07T22:57:02.000-08:00
diff --git 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;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,12 @@ bool CameraSourceTimeLapse::skipFrameAndModifyTimeStamp(int64_t *timestampUs) {`
`257`	`257`	`mForceRead = false;`
`258`	`258`	`*timestampUs =`
`259`	`259`	`mLastFrameTimestampUs + mTimeBetweenTimeLapseVideoFramesUs;`
	`260`	`+`
	`261`	`+ // Really make sure that this video recording frame will not be dropped.`
	`262`	`+ if (*timestampUs < mStartTimeUs) {`
	`263`	`+ LOGI("set timestampUs to start time stamp %lld us", mStartTimeUs);`
	`264`	`+ *timestampUs = mStartTimeUs;`
	`265`	`+ }`
`260`	`266`	`return false;`
`261`	`267`	`}`
`262`	`268`	`}`