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

Commit ea705e24 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "keep tx3g{Buffer,Size,Filled} in sync" into rvc-dev am: e818a4b1 am: 0c239783 

Change-Id: I2e3fe07cd83a5548a4477dc4ad2f7e725594e669
parents 06787df4 0c239783

media/extractors/mp4/MPEG4Extractor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                    // drop it now to reduce our footprint

                    free(mLastTrack->mTx3gBuffer);

                    mLastTrack->mTx3gBuffer = NULL;

                    mLastTrack->mTx3gFilled = 0;

                    mLastTrack->mTx3gSize = 0;

                }



                const char *mime;
@@ -2788,6 +2790,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
            // if those apps are compensating for it, we'd break them with such a change

            //



            if (mLastTrack->mTx3gBuffer == NULL) {

                mLastTrack->mTx3gSize = 0;

                mLastTrack->mTx3gFilled = 0;

            }

            if (mLastTrack->mTx3gSize - mLastTrack->mTx3gFilled < chunk_size) {

                size_t growth = kTx3gGrowth;

                if (growth < chunk_size) {