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

Commit 1bf5520d authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "camera:fix wait request timeout in switching camera" into main am: 16bf9fca am: dfad6636 

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



Change-Id: Icb987d69e93ab492533d12b6a65a0258a833d850
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5b84f97 dfad6636

services/camera/libcameraservice/device3/Camera3Device.cpp

+20 −12
Original line number Diff line number Diff line
@@ -3706,19 +3706,18 @@ bool Camera3Device::RequestThread::threadLoop() { 
        cleanUpFailedRequests(/*sendRequestError*/ true);

        // Check if any stream is abandoned.

        checkAndStopRepeatingRequest();

        // Inform waitUntilRequestProcessed thread of a failed request ID

        wakeupLatestRequest(/*failedRequestId*/true, latestRequestId);

        return true;

    } else if (res != OK) {

        cleanUpFailedRequests(/*sendRequestError*/ false);

        // Inform waitUntilRequestProcessed thread of a failed request ID

        wakeupLatestRequest(/*failedRequestId*/true, latestRequestId);

        return false;

    }



    // Inform waitUntilRequestProcessed thread of a new request ID

    {

        Mutex::Autolock al(mLatestRequestMutex);



        mLatestRequestId = latestRequestId;

        mLatestRequestSignal.signal();

    }

    wakeupLatestRequest(/*failedRequestId*/false, latestRequestId);



    // Submit a batch of requests to HAL.

    // Use flush lock only when submitting multilple requests in a batch.
@@ -4473,12 +4472,7 @@ void Camera3Device::RequestThread::cleanUpFailedRequests(bool sendRequestError) 
                        hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST,

                        captureRequest->mResultExtras);

            }

            {

                Mutex::Autolock al(mLatestRequestMutex);



                mLatestFailedRequestId = captureRequest->mResultExtras.requestId;

                mLatestRequestSignal.signal();

            }

            wakeupLatestRequest(/*failedRequestId*/true, captureRequest->mResultExtras.requestId);

        }



        // Remove yet-to-be submitted inflight request from inflightMap
@@ -5140,6 +5134,20 @@ status_t Camera3Device::RequestThread::setHalInterface( 
    return OK;

}



void  Camera3Device::RequestThread::wakeupLatestRequest(

        bool latestRequestFailed,

        int32_t latestRequestId) {

    Mutex::Autolock al(mLatestRequestMutex);



    if (latestRequestFailed) {

        mLatestFailedRequestId = latestRequestId;

    } else {

        mLatestRequestId = latestRequestId;

    }

    mLatestRequestSignal.signal();

}





/**

 * PreparerThread inner class methods

 */

services/camera/libcameraservice/device3/Camera3Device.h

+5 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,11 @@ class Camera3Device : 
            const sp<CaptureRequest> &request,

            const CameraMetadata& injectedSessionParams);



        /**

         * signal mLatestRequestmutex

         **/

        void wakeupLatestRequest(bool latestRequestFailed, int32_t latestRequestId);



      protected:



        virtual bool threadLoop();