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

Commit 8d009afd authored by Ram Mohan M's avatar Ram Mohan M Committed by Keun Soo Yim
Browse files

bug fix: restore support for broken flag 

timestampDevTest flag can be used to disable timestamp deviation
tests. The flag is not working as intended. This is corrected.

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64743270
Bug: 65166112

Merged-In: I611e96498a4677b6ccbff33c291d56eed7b48f6f
Change-Id: I611e96498a4677b6ccbff33c291d56eed7b48f6f
(cherry picked from commit dc6270ec)
parent 0a542276

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ TEST_F(AudioDecHidlTest, DecodeTest) { 
        eleInfo >> flags;

        eleInfo >> timestamp;

        Info.push_back({bytesCount, flags, timestamp});

        if (flags != OMX_BUFFERFLAG_CODECCONFIG)

        if (timestampDevTest && (flags != OMX_BUFFERFLAG_CODECCONFIG))

            timestampUslist.push_back(timestamp);

    }

    eleInfo.close();
@@ -803,7 +803,7 @@ TEST_F(AudioDecHidlTest, DecodeTest) { 
    packedArgs audioArgs = {eEncoding, compName};

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, nullptr,

            portReconfiguration, kPortIndexInput, kPortIndexOutput, &audioArgs);

    EXPECT_EQ(timestampUslist.empty(), true);

    if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true);

    // set state to idle

    changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);

    // set state to executing

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ TEST_F(VideoDecHidlTest, DecodeTest) { 
        eleInfo >> flags;

        eleInfo >> timestamp;

        Info.push_back({bytesCount, flags, timestamp});

        if (flags != OMX_BUFFERFLAG_CODECCONFIG)

        if (timestampDevTest && (flags != OMX_BUFFERFLAG_CODECCONFIG))

            timestampUslist.push_back(timestamp);

        if (maxBytesCount < bytesCount) maxBytesCount = bytesCount;

    }
@@ -995,7 +995,7 @@ TEST_F(VideoDecHidlTest, DecodeTest) { 
                           kPortIndexInput, kPortIndexOutput, portMode[1]);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, portMode,

            portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr);

    EXPECT_EQ(timestampUslist.empty(), true);

    if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true);

    // set state to idle

    changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);

    // set state to executing

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ TEST_F(VideoEncHidlTest, EncodeTest) { 
    eleStream.close();

    waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag);

    EXPECT_EQ(timestampUslist.empty(), true);

    if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true);



    // set state to idle

    changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);