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

Commit 3a0e8687 authored by Ram Mohan M's avatar Ram Mohan M Committed by android-build-merger
Browse files

Merge "bug fix: restore support for broken flag" into oc-dev am: 40aad4e9... 

Merge "bug fix: restore support for broken flag" into oc-dev am: 40aad4e9 am: 062192a1 am: 381b0f4c
am: eb5f31b4

Change-Id: I1b195a6baba885a7118c077cd3dbf8b0176df8fa
parents 2c6477de eb5f31b4

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

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

        eleInfo >> flags;

        eleInfo >> timestamp;

        eleInfo >> timestamp;

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

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

        if (flags != OMX_BUFFERFLAG_CODECCONFIG)

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

            timestampUslist.push_back(timestamp);

            timestampUslist.push_back(timestamp);

    }

    }

    eleInfo.close();

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

    packedArgs audioArgs = {eEncoding, compName};

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

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

            portReconfiguration, kPortIndexInput, kPortIndexOutput, &audioArgs);

            portReconfiguration, kPortIndexInput, kPortIndexOutput, &audioArgs);

    EXPECT_EQ(timestampUslist.empty(), true);

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

    // set state to idle

    // set state to idle

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

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

    // set state to executing

    // set state to executing

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

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

        eleInfo >> flags;

        eleInfo >> timestamp;

        eleInfo >> timestamp;

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

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

        if (flags != OMX_BUFFERFLAG_CODECCONFIG)

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

            timestampUslist.push_back(timestamp);

            timestampUslist.push_back(timestamp);

        if (maxBytesCount < bytesCount) maxBytesCount = bytesCount;

        if (maxBytesCount < bytesCount) maxBytesCount = bytesCount;

    }

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

                           kPortIndexInput, kPortIndexOutput, portMode[1]);

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

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

            portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr);

            portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr);

    EXPECT_EQ(timestampUslist.empty(), true);

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

    // set state to idle

    // set state to idle

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

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

    // set state to executing

    // set state to executing

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

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

    eleStream.close();

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

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

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

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

    EXPECT_EQ(timestampUslist.empty(), true);

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





    // set state to idle

    // set state to idle

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

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