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

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

Merge "CCodec: fix wrapping logic" am: d4c493df 

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



Change-Id: If58c2e69ec127dd4105fe9068803fe4ecf1d02d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b730f5e d4c493df

media/codec2/sfplugin/Codec2Buffer.cpp

+2 −3
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ public: 
                        * 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 @@ public: 
                    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());

            }

        }