commit c74fafab6db73b0ee7adbba937c502d1806df5b9
author Krzysztof Semko <krzysztof.semko@sony.com> Wed Nov 14 20:06:04 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 14 20:06:04 2018 -0800
tree 8036e2ebe7ddcd008949f4daaf5a3a505d66cf0e
parent 0332f621e2e65e7edddd6e9bacd874f429de8061
parent 8d86a6d3871f939944c534a430e7950ef77f9475

Merge "Do not update time offset for time lapse recording after pause" am: a864ea5f2d am: 05948baa04
am: 8d86a6d387

Change-Id: I705526227a7972f9d75d01a637756c123b32eeee

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 30c0b1c..e3ae02e 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1996,7 +1996,7 @@
         mTotalPausedDurationUs += resumeStartTimeUs - mPauseStartTimeUs - 30000;
     }
     double timeOffset = -mTotalPausedDurationUs;
-    if (mCaptureFpsEnable) {
+    if (mCaptureFpsEnable && (mVideoSource == VIDEO_SOURCE_CAMERA)) {
         timeOffset *= mCaptureFps / mFrameRate;
     }
     sp<MetaData> meta = new MetaData;