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

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

Merge "Fix Issue in MPEG4 Append" into main am: bfc2e73d am: 1eea36c1 

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



Change-Id: I090b370085e0b808db1fa71f7c176ea4f979d723
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0577f178 1eea36c1

media/libstagefright/MPEG4Writer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1640,6 +1640,11 @@ off64_t MPEG4Writer::addSample_l( 
    ALOGV("buffer->range_length:%lld", (long long)buffer->range_length());

    if (buffer->meta_data().findInt64(kKeySampleFileOffset, &offset)) {

        ALOGV("offset:%lld, old_offset:%lld", (long long)offset, (long long)old_offset);

        if (mMaxOffsetAppend > offset) {

            // This has already been appended, skip updating mOffset value.

            *bytesWritten = buffer->range_length();

            return offset;

        }

        if (old_offset == offset) {

            mOffset += buffer->range_length();

        } else {