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

Commit 5f44635d authored by Zhijun He's avatar Zhijun He
Browse files

camera3: Delete output stream of bi-directional stream 

Bi-directional stream (like Zsl stream) is both input and output streams. When
deleted, both streams need to be deleted.

Change-Id: I8b6bb9054fec264cc03754003797de0bae10cb20
parent b2b9b2db

services/camera/libcameraservice/device3/Camera3Device.cpp

+7 −3
Original line number Diff line number Diff line
@@ -840,16 +840,20 @@ status_t Camera3Device::deleteStream(int id) { 
    }



    sp<Camera3StreamInterface> deletedStream;

    ssize_t outputStreamIdx = mOutputStreams.indexOfKey(id);

    if (mInputStream != NULL && id == mInputStream->getId()) {

        deletedStream = mInputStream;

        mInputStream.clear();

    } else {

        ssize_t idx = mOutputStreams.indexOfKey(id);

        if (idx == NAME_NOT_FOUND) {

        if (outputStreamIdx == NAME_NOT_FOUND) {

            CLOGE("Stream %d does not exist", id);

            return BAD_VALUE;

        }

        deletedStream = mOutputStreams.editValueAt(idx);

    }



    // Delete output stream or the output part of a bi-directional stream.

    if (outputStreamIdx != NAME_NOT_FOUND) {

        deletedStream = mOutputStreams.editValueAt(outputStreamIdx);

        mOutputStreams.removeItem(id);

    }