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

Commit f86534be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MPEG4Writer: Fix unsigned integer overflow" into main am: 97138efc am: 8d5d1952 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3236960



Change-Id: Ia3d8a797e0af318ded581bcd7a1b260bdfb54bcd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 692ecc04 8d5d1952

media/libstagefright/MPEG4Writer.cpp

+6 −0
Original line number Diff line number Diff line
@@ -3776,6 +3776,12 @@ status_t MPEG4Writer::Track::threadEntry() { 
            if (mStszTableEntries->count() == 0) {

                mFirstSampleTimeRealUs = systemTime() / 1000;

                if (timestampUs < 0 && mFirstSampleStartOffsetUs == 0) {

                    if (WARN_UNLESS(timestampUs != INT64_MIN, "for %s track", trackName)) {

                        copy->release();

                        mSource->stop();

                        mIsMalformed = true;

                        break;

                    }

                    mFirstSampleStartOffsetUs = -timestampUs;

                    timestampUs = 0;

                }