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

Commit 708601d0 authored by Zhijun He's avatar Zhijun He Committed by Android Git Automerger
Browse files

am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when... 

am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed

* commit 'f0fb921c':
  DO NOT MERGE: Camera: delete preview callback when preview size is changed
parents 3a20f9af f0fb921c

services/camera/libcameraservice/api1/Camera2Client.cpp

+16 −0
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
        return OK;

    }

    params.state = Parameters::STOPPED;

    int lastPreviewStreamId = mStreamingProcessor->getPreviewStreamId();



    res = mStreamingProcessor->updatePreviewStream(params);

    if (res != OK) {
@@ -742,6 +743,8 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
        return res;

    }



    bool previewStreamChanged = mStreamingProcessor->getPreviewStreamId() != lastPreviewStreamId;



    // We could wait to create the JPEG output stream until first actual use

    // (first takePicture call). However, this would substantially increase the

    // first capture latency on HAL3 devices, and potentially on some HAL2
@@ -791,6 +794,19 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
            return res;

        }

        outputStreams.push(getCallbackStreamId());

    } else if (previewStreamChanged && mCallbackProcessor->getStreamId() != NO_STREAM) {

        /**

         * Delete the unused callback stream when preview stream is changed and

         * preview is not enabled. Don't need stop preview stream as preview is in

         * STOPPED state now.

         */

        ALOGV("%s: Camera %d: Delete unused preview callback stream.",  __FUNCTION__, mCameraId);

        res = mCallbackProcessor->deleteStream();

        if (res != OK) {

            ALOGE("%s: Camera %d: Unable to delete callback stream %s (%d)",

                    __FUNCTION__, mCameraId, strerror(-res), res);

            return res;

        }

    }

    if (params.zslMode && !params.recordingHint) {

        res = updateProcessorStream(mZslProcessor, params);