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

Commit ff30ed79 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Automerger Merge Worker
Browse files

Camera: fix wrong signalStreamFlush call am: e7511472 

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

Change-Id: I57927fb97bad116b2f27d3f92e5085a5626d3262
parents 818e6575 e7511472

services/camera/libcameraservice/device3/Camera3Device.cpp

+12 −0
Original line number Diff line number Diff line
@@ -1833,10 +1833,12 @@ status_t Camera3Device::waitUntilStateThenRelock(bool active, nsecs_t timeout) { 


    mStatusWaiters++;



    bool signalPipelineDrain = false;

    if (!active && mUseHalBufManager) {

        auto streamIds = mOutputStreams.getStreamIds();

        if (mStatus == STATUS_ACTIVE) {

            mRequestThread->signalPipelineDrain(streamIds);

            signalPipelineDrain = true;

        }

        mRequestBufferSM.onWaitUntilIdle();

    }
@@ -1866,6 +1868,10 @@ status_t Camera3Device::waitUntilStateThenRelock(bool active, nsecs_t timeout) { 
        }

    } while (!stateSeen);



    if (signalPipelineDrain) {

        mRequestThread->resetPipelineDrain();

    }



    mStatusWaiters--;



    return res;
@@ -4802,6 +4808,12 @@ void Camera3Device::RequestThread::signalPipelineDrain(const std::vector<int>& s 
    mStreamIdsToBeDrained = streamIds;

}



void Camera3Device::RequestThread::resetPipelineDrain() {

    Mutex::Autolock pl(mPauseLock);

    mNotifyPipelineDrain = false;

    mStreamIdsToBeDrained.clear();

}



void Camera3Device::RequestThread::clearPreviousRequest() {

    Mutex::Autolock l(mRequestLock);

    mPrevRequest.clear();

services/camera/libcameraservice/device3/Camera3Device.h

+1 −0
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ class Camera3Device : 
        }



        void signalPipelineDrain(const std::vector<int>& streamIds);

        void resetPipelineDrain();



        status_t switchToOffline(

                const std::vector<int32_t>& streamsToKeep,