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

Commit f854156a authored by Hangyu Kuang's avatar Hangyu Kuang Committed by android-build-merger
Browse files

Merge "media: Do not reset mHasMoovBox when switch recording output." into pi-dev 

am: 354a89b3

Change-Id: I1bc4dd686c5c513ecd55807fc06b07b268305f95
parents 515fe146 354a89b3

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ void MPEG4Writer::initInternal(int fd, bool isFirstSession) { 
    mStreamableFile = false;

    mTimeScale = -1;

    mHasFileLevelMeta = false;

    mHasMoovBox = false;

    mPrimaryItemId = 0;

    mAssociationEntryCount = 0;

    mNumGrids = 0;
@@ -505,6 +504,7 @@ void MPEG4Writer::initInternal(int fd, bool isFirstSession) { 
    // And they will stay the same for all the recording sessions.

    if (isFirstSession) {

        mMoovExtraSize = 0;

        mHasMoovBox = false;

        mMetaKeys = new AMessage();

        addDeviceMeta();

        mLatitudex10000 = 0;