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

Commit 893068ad authored by Zhijun He's avatar Zhijun He
Browse files

Camera: drop stale callback buffer 

Sometimes, when preview size is changed and preview callback is enabled, stale
callback buffer from previous size could be delivered to callback processor
because stop preview doesn't guarantee consumer side buffers are properly
cleaned up. We need drop these buffers to avoid sending wrong data to app side.

Bug: 11009183
Change-Id: If9281e8c02481f883872ce58dfd8660a06d56a47
parent 9fc79c6f

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 ||