commit 44a98a18fba9a5e1d6ab810d93c26196688663d3
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 30 20:17:36 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 30 20:17:36 2022 +0000
tree e16f93a8be9a58a4ffc5d8b75587638067b98c58
parent bef22157a660638572983fcfb7e737e2e4de6442
parent 38c98dd6c6c3a2fe59da6c2ccdf6c757453d53c2

Merge "CCodec: fix wrapping logic" am: d4c493dfd6 am: 72c93f5f96 am: 38c98dd6c6

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

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

media/codec2/sfplugin/Codec2Buffer.cpp

diff --git a/media/codec2/sfplugin/Codec2Buffer.cpp b/media/codec2/sfplugin/Codec2Buffer.cpp
index 876c96d..b9270de 100644
--- a/media/codec2/sfplugin/Codec2Buffer.cpp
+++ b/media/codec2/sfplugin/Codec2Buffer.cpp
@@ -533,7 +533,7 @@
                         * align(mHeight, 64) / plane.rowSampling;
             }
 
-            if (minPtr == mView.data()[0] && (maxPtr - minPtr + 1) <= planeSize) {
+            if (minPtr == mView.data()[0] && (maxPtr - minPtr) <= planeSize) {
                 // FIXME: this is risky as reading/writing data out of bound results
                 //        in an undefined behavior, but gralloc does assume a
                 //        contiguous mapping
@@ -545,8 +545,7 @@
                     mediaImage->mPlane[i].mHorizSubsampling = plane.colSampling;
                     mediaImage->mPlane[i].mVertSubsampling = plane.rowSampling;
                 }
-                mWrapped = new ABuffer(const_cast<uint8_t *>(minPtr),
-                                       maxPtr - minPtr + 1);
+                mWrapped = new ABuffer(const_cast<uint8_t *>(minPtr), maxPtr - minPtr);
                 ALOGV("Converter: wrapped (capacity=%zu)", mWrapped->capacity());
             }
         }