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
This commit is contained in:
Ram Mohan M 2017-08-30 11:56:33 +05:30 committed by Pawin Vongmasa
parent eb9e25a3e2
commit dc6270ecc1
3 changed files with 5 additions and 5 deletions

View file

@ -761,7 +761,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();
@ -803,7 +803,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

View file

@ -777,7 +777,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);
} }
eleInfo.close(); eleInfo.close();
@ -834,7 +834,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

View file

@ -1286,7 +1286,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);