commit 2f10c36ebe7f1d7d0219b1a7f886232d04b8adc5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 21 19:27:19 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 21 19:27:19 2024 +0000
tree 7be6e336703b3c6c1469a28c21d54bc10b11e91f
parent 0577f178a7534b9d2d9aa844afbb0cae906ca145
parent 1eea36c188cee7c949dcb2900e023a39cbf7cea0

Merge "Fix Issue in MPEG4 Append" into main am: bfc2e73d49 am: 1eea36c188

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

Change-Id: I090b370085e0b808db1fa71f7c176ea4f979d723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index d50c06b..a18dbfe 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -1640,6 +1640,11 @@
     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 {