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

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

Merge "CCodec: fix underflow issue on handleImageData" am: 85cb71d0 am: c5ad05fa am: 7467de59 

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

Change-Id: I9875d200018d7dfbb2e61092114d9f1cfcaceaab
parents aed6389e 7467de59

media/codec2/sfplugin/CCodecBuffers.cpp

+3 −1
Original line number Diff line number Diff line
@@ -91,7 +91,9 @@ void CCodecBuffers::handleImageData(const sp<Codec2Buffer> &buffer) { 
            newFormat->setInt32(KEY_STRIDE, stride);

            ALOGD("[%s] updating stride = %d", mName, stride);

            if (img->mNumPlanes > 1 && stride > 0) {

                int32_t vstride = (img->mPlane[1].mOffset - img->mPlane[0].mOffset) / stride;

                int64_t offsetDelta =

                    (int64_t)img->mPlane[1].mOffset - (int64_t)img->mPlane[0].mOffset;

                int32_t vstride = int32_t(offsetDelta / stride);

                newFormat->setInt32(KEY_SLICE_HEIGHT, vstride);

                ALOGD("[%s] updating vstride = %d", mName, vstride);

            }