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

Commit b6e483bb authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: don't enable buffer manager for display/texture streams" into qt-dev 

am: 68b8684c

Change-Id: I6907111837db9888d3af5d6e54dec16126ae738e
parents a74392b1 68b8684c

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+4 −1
Original line number Diff line number Diff line
@@ -491,8 +491,11 @@ status_t Camera3OutputStream::configureConsumerQueueLocked() { 
     * sets the mBufferManager if device version is > HAL3.2, which guarantees that the buffer

     * manager setup is skipped in below code. Note that HAL3.2 is also excluded here, as some

     * HAL3.2 devices may not support the dynamic buffer registeration.

     * Also Camera3BufferManager does not support display/texture streams as they have its own

     * buffer management logic.

     */

    if (mBufferManager != 0 && mSetId > CAMERA3_STREAM_SET_ID_INVALID) {

    if (mBufferManager != 0 && mSetId > CAMERA3_STREAM_SET_ID_INVALID &&

            !(isConsumedByHWComposer() || isConsumedByHWTexture())) {

        uint64_t consumerUsage = 0;

        getEndpointUsage(&consumerUsage);

        StreamInfo streamInfo(