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

Commit a617c8aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: fix wrong metadata pointer" am: 2610b34b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1500851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied9125a7ac53a17f6e63b0c1ea8deef467aa2b9c
parents ff651935 2610b34b

services/camera/libcameraservice/device3/Camera3Device.cpp

+14 −3
Original line number Diff line number Diff line
@@ -4675,15 +4675,21 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
        }

        bool isStillCapture = false;

        bool isZslCapture = false;

        const camera_metadata_t* settings = halRequest->settings;

        bool shouldUnlockSettings = false;

        if (settings == nullptr) {

            shouldUnlockSettings = true;

            settings = captureRequest->mSettingsList.begin()->metadata.getAndLock();

        }

        if (!mNextRequests[0].captureRequest->mSettingsList.begin()->metadata.isEmpty()) {

            camera_metadata_ro_entry_t e = camera_metadata_ro_entry_t();

            find_camera_metadata_ro_entry(halRequest->settings, ANDROID_CONTROL_CAPTURE_INTENT, &e);

            find_camera_metadata_ro_entry(settings, ANDROID_CONTROL_CAPTURE_INTENT, &e);

            if ((e.count > 0) && (e.data.u8[0] == ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE)) {

                isStillCapture = true;

                ATRACE_ASYNC_BEGIN("still capture", mNextRequests[i].halRequest.frame_number);

            }



            find_camera_metadata_ro_entry(halRequest->settings, ANDROID_CONTROL_ENABLE_ZSL, &e);

            find_camera_metadata_ro_entry(settings, ANDROID_CONTROL_ENABLE_ZSL, &e);

            if ((e.count > 0) && (e.data.u8[0] == ANDROID_CONTROL_ENABLE_ZSL_TRUE)) {

                isZslCapture = true;

            }
@@ -4692,7 +4698,7 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
                totalNumBuffers, captureRequest->mResultExtras,

                /*hasInput*/halRequest->input_buffer != NULL,

                hasCallback,

                calculateMaxExpectedDuration(halRequest->settings),

                calculateMaxExpectedDuration(settings),

                requestedPhysicalCameras, isStillCapture, isZslCapture,

                captureRequest->mRotateAndCropAuto, mPrevCameraIdsWithZoom,

                (mUseHalBufManager) ? uniqueSurfaceIdMap :
@@ -4702,6 +4708,11 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
                __FUNCTION__,

                captureRequest->mResultExtras.requestId, captureRequest->mResultExtras.frameNumber,

                captureRequest->mResultExtras.burstId);



        if (shouldUnlockSettings) {

            captureRequest->mSettingsList.begin()->metadata.unlock(settings);

        }



        if (res != OK) {

            SET_ERR("RequestThread: Unable to register new in-flight request:"

                    " %s (%d)", strerror(-res), res);