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

Commit 3e80b3b5 authored by Changyeon Jo's avatar Changyeon Jo
Browse files

Fix EVS VTS test cases 



This change modifies logics to verify test results that need to parse
events from EVS manager.  Especially, test cases that run multiple
camera clients spawn threads to listen EVS events.

Also, this updates waitForEvent() method to return more precise results.

Bug: 142275664
Test: VtsHalEvsV1_1Target
Change-Id: Ic328217be1e49a3a862facf783a5356ac34ce9ed
Signed-off-by: default avatarChangyeon Jo <changyeon@google.com>
parent 56c9b377

automotive/evs/1.1/vts/functional/FrameHandler.cpp

+29 −19
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void FrameHandler::blockingStopStream() { 




bool FrameHandler::returnHeldBuffer() {

    std::unique_lock<std::mutex> lock(mLock);

    std::lock_guard<std::mutex> lock(mLock);



    // Return the oldest buffer we're holding

    if (mHeldBuffers.empty()) {
@@ -105,7 +105,7 @@ bool FrameHandler::returnHeldBuffer() { 




bool FrameHandler::isRunning() {

    std::unique_lock<std::mutex> lock(mLock);

    std::lock_guard<std::mutex> lock(mLock);

    return mRunning;

}
@@ -120,7 +120,7 @@ void FrameHandler::waitForFrameCount(unsigned frameCount) { 




void FrameHandler::getFramesCounters(unsigned* received, unsigned* displayed) {

    std::unique_lock<std::mutex> lock(mLock);

    std::lock_guard<std::mutex> lock(mLock);



    if (received) {

        *received = mFramesReceived;
@@ -213,8 +213,10 @@ Return<void> FrameHandler::deliverFrame_1_1(const hidl_vec<BufferDesc_1_1>& buff 


Return<void> FrameHandler::notify(const EvsEventDesc& event) {

    // Local flag we use to keep track of when the stream is stopping

    mLock.lock();

    mLatestEventDesc = event;

    std::unique_lock<std::mutex> lock(mEventLock);

    mLatestEventDesc.aType = event.aType;

    mLatestEventDesc.payload[0] = event.payload[0];

    mLatestEventDesc.payload[1] = event.payload[1];

    if (mLatestEventDesc.aType == EvsEventType::STREAM_STOPPED) {

        // Signal that the last frame has been received and the stream is stopped

        mRunning = false;
@@ -224,7 +226,7 @@ Return<void> FrameHandler::notify(const EvsEventDesc& event) { 
    } else {

        ALOGD("Received an event %s", eventToString(mLatestEventDesc.aType));

    }

    mLock.unlock();

    lock.unlock();

    mEventSignal.notify_one();



    return Void();
@@ -345,25 +347,33 @@ void FrameHandler::getFrameDimension(unsigned* width, unsigned* height) { 
}



bool FrameHandler::waitForEvent(const EvsEventDesc& aTargetEvent,

                                      EvsEventDesc& aReceivedEvent) {

                                      EvsEventDesc& aReceivedEvent,

                                      bool ignorePayload) {

    // Wait until we get an expected parameter change event.

    std::unique_lock<std::mutex> lock(mEventLock);

    auto now = std::chrono::system_clock::now();

    bool found = false;

    while (!found) {

        bool result = mEventSignal.wait_until(lock, now + 5s,

        [this, aTargetEvent, &aReceivedEvent](){

            bool flag = (mLatestEventDesc.aType == aTargetEvent.aType) &&

                        (mLatestEventDesc.payload[0] == aTargetEvent.payload[0]) &&

                        (mLatestEventDesc.payload[1] == aTargetEvent.payload[1]);

            [this, aTargetEvent, ignorePayload, &aReceivedEvent, &found](){

                found = (mLatestEventDesc.aType == aTargetEvent.aType) &&

                        (ignorePayload || (mLatestEventDesc.payload[0] == aTargetEvent.payload[0] &&

                                           mLatestEventDesc.payload[1] == aTargetEvent.payload[1]));



                aReceivedEvent.aType = mLatestEventDesc.aType;

                aReceivedEvent.payload[0] = mLatestEventDesc.payload[0];

                aReceivedEvent.payload[1] = mLatestEventDesc.payload[1];



            return flag;

                return found;

            }

        );



    return !result;

        if (!result) {

            ALOGW("A timer is expired before a target event has happened.");

            break;

        }

    }



    return found;

}



const char *FrameHandler::eventToString(const EvsEventType aType) {

automotive/evs/1.1/vts/functional/FrameHandler.h

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ public: 


    void waitForFrameCount(unsigned frameCount);

    bool waitForEvent(const EvsEventDesc& aTargetEvent,

                            EvsEventDesc& aReceivedEvent);

                            EvsEventDesc& aReceivedEvent,

                            bool ignorePayload = false);

    void getFramesCounters(unsigned* received, unsigned* displayed);

    void getFrameDimension(unsigned* width, unsigned* height);

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

+395 −75

File changed.

Preview size limit exceeded, changes collapsed.