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

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

Merge "Camera3: return cancelled buffers to buffer manager"

parents 254012a0 1ff811b0

services/camera/libcameraservice/device3/Camera3BufferManager.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -362,11 +362,12 @@ status_t Camera3BufferManager::removeBuffersFromBufferListLocked(BufferList& buf 
    while (i != bufferList.end()) {

    while (i != bufferList.end()) {

        ssize_t idx = i->indexOfKey(streamId);

        ssize_t idx = i->indexOfKey(streamId);

        if (idx != NAME_NOT_FOUND) {

        if (idx != NAME_NOT_FOUND) {

            ALOGV("%s: Remove a buffer for stream %d, free buffer total count: %zu",

                    __FUNCTION__, streamId, bufferList.size());

            i->removeItem(streamId);

            i->removeItem(streamId);

            if (i->isEmpty()) {

            if (i->isEmpty()) {

                i = bufferList.erase(i);

                i = bufferList.erase(i);

            }

            }

            break;

        } else {

        } else {

            i++;

            i++;

        }

        }

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,11 @@ status_t Camera3OutputStream::returnBufferCheckedLocked( 
            ALOGE("%s: Stream %d: Error cancelling buffer to native window:"

            ALOGE("%s: Stream %d: Error cancelling buffer to native window:"

                  " %s (%d)", __FUNCTION__, mId, strerror(-res), res);

                  " %s (%d)", __FUNCTION__, mId, strerror(-res), res);

        }

        }



        if (mUseBufferManager) {

            // Return this buffer back to buffer manager.

            mBufferReleasedListener->onBufferReleased();

        }

    } else {

    } else {

        if (mTraceFirstBuffer && (stream_type == CAMERA3_STREAM_OUTPUT)) {

        if (mTraceFirstBuffer && (stream_type == CAMERA3_STREAM_OUTPUT)) {

            {

            {