From dc6270ecc1d6a3ac18b2820ef176bb4ea58fba3f Mon Sep 17 00:00:00 2001 From: Ram Mohan M Date: Wed, 30 Aug 2017 11:56:33 +0530 Subject: [PATCH] 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 --- .../1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | 4 ++-- .../1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | 4 ++-- .../1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp index ab18b6cc..9e5dde1f 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp @@ -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 diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp index 9773cb00..00685350 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp @@ -777,7 +777,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); } eleInfo.close(); @@ -834,7 +834,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 diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp index cd6eaf56..bbe08435 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp @@ -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); -- 2.11.0