Merge "keep tx3g{Buffer,Size,Filled} in sync" into rvc-dev

4 years ago · e818a4b17a
parent 7f6c727f2b f2acb7a018
commit e818a4b17a
1 changed files with 6 additions and 0 deletions
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@ -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) {