commit 689a8b4bc9859d0e5f5a75a9326046d80635f51a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 04 09:56:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 04 09:56:25 2021 +0000
tree 1fe38aee5b41373bea5e9db5cb7c3e6bcf767b77
parent 39aa749a044428432b6a2a3389e0377fa6003601
parent 9efce6407452dccf2650ad96b5c6a29a8ca4a914

Merge "Fix logic error in SkipCutBuffer.cpp" am: 9efce64074

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

Change-Id: Icf94bce52caa2572e84ac89429e446ea0d81581e

media/libstagefright/SkipCutBuffer.cpp

diff --git a/media/libstagefright/SkipCutBuffer.cpp b/media/libstagefright/SkipCutBuffer.cpp
index ee9016d..de91533 100644
--- a/media/libstagefright/SkipCutBuffer.cpp
+++ b/media/libstagefright/SkipCutBuffer.cpp
@@ -145,7 +145,19 @@
     if (available < num) {
         int32_t newcapacity = mCapacity + (num - available);
         char * newbuffer = new char[newcapacity];
-        memcpy(newbuffer, mCutBuffer, mCapacity);
+        if (mWriteHead < mReadHead) {
+            // data isn't continuous, need to memcpy twice
+            // to move previous data to new buffer.
+            size_t copyLeft = mCapacity - mReadHead;
+            memcpy(newbuffer, mCutBuffer + mReadHead, copyLeft);
+            memcpy(newbuffer + copyLeft, mCutBuffer, mWriteHead);
+            mReadHead = 0;
+            mWriteHead += copyLeft;
+        } else {
+            memcpy(newbuffer, mCutBuffer + mReadHead, mWriteHead - mReadHead);
+            mWriteHead -= mReadHead;
+            mReadHead = 0;
+        }
         delete [] mCutBuffer;
         mCapacity = newcapacity;
         mCutBuffer = newbuffer;