Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c74fafab authored by Krzysztof Semko's avatar Krzysztof Semko Committed by android-build-merger
Browse files

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

Merge "Do not update time offset for time lapse recording after pause" am: a864ea5f am: 05948baa
am: 8d86a6d3

Change-Id: I705526227a7972f9d75d01a637756c123b32eeee
parents 0332f621 8d86a6d3

media/libmediaplayerservice/StagefrightRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1996,7 +1996,7 @@ status_t StagefrightRecorder::resume() { 
        mTotalPausedDurationUs += resumeStartTimeUs - mPauseStartTimeUs - 30000;

    }

    double timeOffset = -mTotalPausedDurationUs;

    if (mCaptureFpsEnable) {

    if (mCaptureFpsEnable && (mVideoSource == VIDEO_SOURCE_CAMERA)) {

        timeOffset *= mCaptureFps / mFrameRate;

    }

    sp<MetaData> meta = new MetaData;