commit 8d86a6d3871f939944c534a430e7950ef77f9475
author Krzysztof Semko <krzysztof.semko@sony.com> Wed Nov 14 19:58:36 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 14 19:58:36 2018 -0800
tree 28f80995b60cb967fcb90606d4c0998031754ed8
parent 7bff17adacd9582347a3671a5e1f37ac876012d1
parent 05948baa045973747cad0e75b61a08af240923ff

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

Change-Id: I38f29db5e54427f9e0a8873473c56dc14cd458a6

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;