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

Commit 5830754d authored by Changyeon Jo's avatar Changyeon Jo
Browse files

Add MASTER_RELEASED EVS event 



This change adds new event to notify that a master role becomes
available and implements corresponding test cases.

Bug: 138328396
Test: VTS
Change-Id: Iddea2931a71fef2c7f5847eda12362e88cd52e5b
Signed-off-by: default avatarChangyeon Jo <changyeon@google.com>
parent d2a82466

automotive/evs/1.1/types.hal

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ enum InfoEventType : uint32_t { 
     * its value

     */

    PARAMETER_CHANGED,

    /**

     * Master role has become available

     */

    MASTER_RELEASED,

};



/**

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

+140 −32
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ TEST_F(EvsHidlTest, CameraParameter) { 
        ASSERT_TRUE(result == EvsResult::OK ||

                    result == EvsResult::INVALID_ARG);



        if (result == EvsResult::OK) {

            pCam->getParameter(CameraParam::BRIGHTNESS,

                               [&result, &val1](auto status, auto value) {

                                   result = status;
@@ -573,6 +574,7 @@ TEST_F(EvsHidlTest, CameraParameter) { 
            ASSERT_TRUE(result == EvsResult::OK ||

                        result == EvsResult::INVALID_ARG);

            ASSERT_EQ(val0, val1) << "Values are not matched.";

        }



        val0 = 80;

        val1 = 0;
@@ -584,6 +586,7 @@ TEST_F(EvsHidlTest, CameraParameter) { 
        ASSERT_TRUE(result == EvsResult::OK ||

                    result == EvsResult::INVALID_ARG);



        if (result == EvsResult::OK) {

            pCam->getParameter(CameraParam::CONTRAST,

                               [&result, &val1](auto status, auto value) {

                                   result = status;
@@ -594,6 +597,7 @@ TEST_F(EvsHidlTest, CameraParameter) { 
            ASSERT_TRUE(result == EvsResult::OK ||

                        result == EvsResult::INVALID_ARG);

            ASSERT_EQ(val0, val1) << "Values are not matched.";

        }



        val0 = 300;

        val1 = 0;
@@ -605,6 +609,7 @@ TEST_F(EvsHidlTest, CameraParameter) { 
        ASSERT_TRUE(result == EvsResult::OK ||

                    result == EvsResult::INVALID_ARG);



        if (result == EvsResult::OK) {

            pCam->getParameter(CameraParam::ABSOLUTE_ZOOM,

                               [&result, &val1](auto status, auto value) {

                                   result = status;
@@ -615,11 +620,12 @@ TEST_F(EvsHidlTest, CameraParameter) { 
            ASSERT_TRUE(result == EvsResult::OK ||

                        result == EvsResult::INVALID_ARG);

            ASSERT_EQ(val0, val1) << "Values are not matched.";

        }



        result = pCam->unsetMaster();

        ASSERT_TRUE(result == EvsResult::OK);



        // Shutdown another

        // Shutdown

        frameHandler->shutdown();



        // Explicitly release the camera
@@ -628,13 +634,115 @@ TEST_F(EvsHidlTest, CameraParameter) { 
}





/*

 * CameraMasterRelease

 * Verify that non-master client gets notified when the master client either

 * terminates or releases a role.

 */

TEST_F(EvsHidlTest, CameraMasterRelease) {

    ALOGI("Starting CameraMasterRelease test");



    if (mIsHwModule) {

        // This test is not for HW module implementation.

        return;

    }



    // Get the camera list

    loadCameraList();



    // Test each reported camera

    for (auto&& cam: cameraInfo) {

        // Create two camera clients.

        sp<IEvsCamera_1_1> pCamMaster =

            IEvsCamera_1_1::castFrom(pEnumerator->openCamera(cam.cameraId))

            .withDefault(nullptr);

        ASSERT_NE(pCamMaster, nullptr);

        sp<IEvsCamera_1_1> pCamNonMaster =

            IEvsCamera_1_1::castFrom(pEnumerator->openCamera(cam.cameraId))

            .withDefault(nullptr);

        ASSERT_NE(pCamNonMaster, nullptr);



        // Set up per-client frame receiver objects which will fire up its own thread

        sp<FrameHandler> frameHandlerMaster =

            new FrameHandler(pCamMaster, cam,

                             nullptr,

                             FrameHandler::eAutoReturn);

        ASSERT_NE(frameHandlerMaster, nullptr);

        sp<FrameHandler> frameHandlerNonMaster =

            new FrameHandler(pCamNonMaster, cam,

                             nullptr,

                             FrameHandler::eAutoReturn);

        ASSERT_NE(frameHandlerNonMaster, nullptr);



        // Set one client as the master

        EvsResult result = pCamMaster->setMaster();

        ASSERT_TRUE(result == EvsResult::OK);



        // Try to set another client as the master.

        result = pCamNonMaster->setMaster();

        ASSERT_TRUE(result == EvsResult::OWNERSHIP_LOST);



        // Start the camera's video stream via a master client.

        bool startResult = frameHandlerMaster->startStream();

        ASSERT_TRUE(startResult);



        // Ensure the stream starts

        frameHandlerMaster->waitForFrameCount(1);



        // Start the camera's video stream via another client

        startResult = frameHandlerNonMaster->startStream();

        ASSERT_TRUE(startResult);



        // Ensure the stream starts

        frameHandlerNonMaster->waitForFrameCount(1);



        // Non-master client expects to receive a master role relesed

        // notification.

        InfoEventDesc aNotification = {};



        // Release a master role.

        pCamMaster->unsetMaster();



        // Verify a change notification.

        frameHandlerNonMaster->waitForEvent(InfoEventType::MASTER_RELEASED, aNotification);

        ASSERT_EQ(InfoEventType::MASTER_RELEASED,

                  static_cast<InfoEventType>(aNotification.aType));



        // Non-master becomes a master.

        result = pCamNonMaster->setMaster();

        ASSERT_TRUE(result == EvsResult::OK);



        // Previous master client fails to become a master.

        result = pCamMaster->setMaster();

        ASSERT_TRUE(result == EvsResult::OWNERSHIP_LOST);



        // Closing current master client.

        frameHandlerNonMaster->shutdown();



        // Verify a change notification.

        frameHandlerMaster->waitForEvent(InfoEventType::MASTER_RELEASED, aNotification);

        ASSERT_EQ(InfoEventType::MASTER_RELEASED,

                  static_cast<InfoEventType>(aNotification.aType));



        // Closing another stream.

        frameHandlerMaster->shutdown();



        // Explicitly release the camera

        pEnumerator->closeCamera(pCamMaster);

        pEnumerator->closeCamera(pCamNonMaster);

    }





}





/*

 * MultiCameraParameter:

 * Verify that master and non-master clients behave as expected when they try to adjust

 * camera parameters.

 */

TEST_F(EvsHidlTest, MultiCameraParameter) {

    ALOGI("Starting CameraParameter test");

    ALOGI("Starting MultiCameraParameter test");



    if (mIsHwModule) {

        // This test is not for HW module implementation.