Merge "Camera: skip unnecessary reconfig"

6 years ago · b9e732b490
parent 220ff01be8 d8e185c27d
commit b9e732b490
1 changed files with 25 additions and 23 deletions
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@ -779,6 +779,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
    int lastJpegStreamId = mJpegProcessor->getStreamId();
    // If jpeg stream will slow down preview, make sure we remove it before starting preview
    if (params.slowJpegMode) {
+        if (lastJpegStreamId != NO_STREAM) {
            // Pause preview if we are streaming
            int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();
            if (activeRequestId != 0) {
@ -808,6 +809,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
                            __FUNCTION__, mCameraId, strerror(-res), res);
                }
            }
+        }
    } else {
        res = updateProcessorStream(mJpegProcessor, params);
        if (res != OK) {