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

Commit 354a89b3 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

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

parents 2db457b3 2504ce46

media/libstagefright/MPEG4Writer.cpp

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

    mStreamableFile = false;

    mTimeScale = -1;

    mTimeScale = -1;

    mHasFileLevelMeta = false;

    mHasFileLevelMeta = false;

    mHasMoovBox = false;

    mPrimaryItemId = 0;

    mPrimaryItemId = 0;

    mAssociationEntryCount = 0;

    mAssociationEntryCount = 0;

    mNumGrids = 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.

    // And they will stay the same for all the recording sessions.

    if (isFirstSession) {

    if (isFirstSession) {

        mMoovExtraSize = 0;

        mMoovExtraSize = 0;

        mHasMoovBox = false;

        mMetaKeys = new AMessage();

        mMetaKeys = new AMessage();

        addDeviceMeta();

        addDeviceMeta();

        mLatitudex10000 = 0;

        mLatitudex10000 = 0;