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

Commit c476ff38 authored by Daniel Cardenas's avatar Daniel Cardenas Committed by Patrick Pun
Browse files

Increase default timeout for changeStateIdletoExecute() from 100ms to 400ms 

Bug: 70933963
Test: vts-tradefed run vts -m VtsHalMediaOmxV1_0Host
Change-Id: I2f01b5fcd72b03148750589a8eabbc8037f61e6f
parent ca078935

media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ void changeStateIdletoExecute(sp<IOmxNode> omxNode, 
    status = omxNode->sendCommand(toRawCommandType(OMX_CommandStateSet),

                                  OMX_StateExecuting);

    ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);

    status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT);

    status = observer->dequeueMessage(&msg, RELAXED_TIMEOUT);

    ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);

    ASSERT_EQ(msg.type, Message::Type::EVENT);

    ASSERT_EQ(msg.data.eventData.event, OMX_EventCmdComplete);

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
/* As component is switching states (loaded<->idle<->execute), dequeueMessage()

 * expects the events to be received within this duration */

#define DEFAULT_TIMEOUT 150000

// b/70933963

#define RELAXED_TIMEOUT 400000

/* Time interval between successive Input/Output enqueues */

#define DEFAULT_TIMEOUT_Q 2000

/* While the component is amidst a process call, asynchronous commands like

media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp

+2 −4
Original line number Diff line number Diff line
@@ -1165,15 +1165,13 @@ TEST_F(ComponentHidlTest, PortEnableDisable_Execute) { 
            ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);



            // do not enable the port until all the buffers are supplied

            status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT,

                                              &pBuffer[0], &pBuffer[1]);

            status = observer->dequeueMessage(&msg, RELAXED_TIMEOUT, &pBuffer[0], &pBuffer[1]);

            ASSERT_EQ(status,

                      android::hardware::media::omx::V1_0::Status::TIMED_OUT);



            ASSERT_NO_FATAL_FAILURE(allocatePortBuffers(

                omxNode, &pBuffer[i - portBase], i, portMode[i - portBase]));

            status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT,

                                              &pBuffer[0], &pBuffer[1]);

            status = observer->dequeueMessage(&msg, RELAXED_TIMEOUT, &pBuffer[0], &pBuffer[1]);

            ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);

            ASSERT_EQ(msg.type, Message::Type::EVENT);

            ASSERT_EQ(msg.data.eventData.data1, OMX_CommandPortEnable);