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

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

Merge "Camera: skip unnecessary reconfig" am: b9e732b4 am: f694dc1b 

am: e1655e54

Change-Id: I396254dd546aaa7fb2147d60b95cbe8075059f23
parents 4531c707 e1655e54

services/camera/libcameraservice/api1/Camera2Client.cpp

+25 −23
Original line number Original line Diff line number Diff line
@@ -780,6 +780,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
    int lastJpegStreamId = mJpegProcessor->getStreamId();

    int lastJpegStreamId = mJpegProcessor->getStreamId();

    // If jpeg stream will slow down preview, make sure we remove it before starting preview

    // If jpeg stream will slow down preview, make sure we remove it before starting preview

    if (params.slowJpegMode) {

    if (params.slowJpegMode) {

        if (lastJpegStreamId != NO_STREAM) {

            // Pause preview if we are streaming

            // Pause preview if we are streaming

            int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();

            int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();

            if (activeRequestId != 0) {

            if (activeRequestId != 0) {
@@ -809,6 +810,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
                            __FUNCTION__, mCameraId, strerror(-res), res);

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

                }

                }

            }

            }

        }

    } else {

    } else {

        res = updateProcessorStream(mJpegProcessor, params);

        res = updateProcessorStream(mJpegProcessor, params);

        if (res != OK) {

        if (res != OK) {