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

Commit 26c1fb23 authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera: drop stale callback buffer" into klp-dev

parents 353fb9bf 893068ad

services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp

+10 −0
Original line number Diff line number Diff line
@@ -312,6 +312,16 @@ status_t CallbackProcessor::processNewCallback(sp<Camera2Client> &client) { 
            return OK;

        }



        if (imgBuffer.width != static_cast<uint32_t>(l.mParameters.previewWidth) ||

                imgBuffer.height != static_cast<uint32_t>(l.mParameters.previewHeight)) {

            ALOGW("%s: The preview size has changed to %d x %d from %d x %d, this buffer is"

                    " no longer valid, dropping",__FUNCTION__,

                    l.mParameters.previewWidth, l.mParameters.previewHeight,

                    imgBuffer.width, imgBuffer.height);

            mCallbackConsumer->unlockBuffer(imgBuffer);

            return OK;

        }



        previewFormat = l.mParameters.previewFormat;

        useFlexibleYuv = l.mParameters.fastInfo.useFlexibleYuv &&

                (previewFormat == HAL_PIXEL_FORMAT_YCrCb_420_SP ||