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

Commit 7dfeaa17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mpeg4Writer: Synchronize multi-track gainmap muxing" into main

parents da303964 f94d3eae

media/libstagefright/MPEG4Writer.cpp

+13 −3
Original line number Diff line number Diff line
@@ -4212,13 +4212,23 @@ status_t MPEG4Writer::Track::threadEntry() { 
                trackProgressStatus(timestampUs);

            }

        }

        if (!hasMultipleTracks || isGainmapMeta || isGainmap) {



        if (flags_camera::camera_heif_gainmap() && mOwner->mHasGainmap) {

            Mutex::Autolock lock(mOwner->mLock);

            size_t bytesWritten;

            off64_t offset = mOwner->addSample_l(copy, usePrefix, tiffHdrOffset, &bytesWritten);

            addItemOffsetAndSize(offset, bytesWritten, isExif, isGainmapMeta, isGainmap);

            copy->release();

            copy = NULL;

            continue;

        }



        if (!hasMultipleTracks) {

            size_t bytesWritten;

            off64_t offset = mOwner->addSample_l(

                    copy, usePrefix, tiffHdrOffset, &bytesWritten);



            if (mIsHeif) {

                addItemOffsetAndSize(offset, bytesWritten, isExif, isGainmapMeta, isGainmap);

                addItemOffsetAndSize(offset, bytesWritten, isExif);

            } else {

                if (mCo64TableEntries->count() == 0) {

                    addChunkOffset(offset);