commit 05948baa045973747cad0e75b61a08af240923ff
author Krzysztof Semko <krzysztof.semko@sony.com> Wed Nov 14 19:54:18 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 14 19:54:18 2018 -0800
tree 9628d53cbc4440e9e69f2e83be671d548e3afb18
parent 8a7f57252e7d435c722ee246399c35d378d1b2b3
parent a864ea5f2d034069a3ede5fef9180e702666ee37

Merge "Do not update time offset for time lapse recording after pause"
am: a864ea5f2d

Change-Id: I28faf24b08e5944e231c24e8dd370c298164f8fb

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;