diff options
| author | Ram Mohan M <ram.mohan@ittiam.com> | 2017-08-30 11:56:33 +0530 |
|---|---|---|
| committer | Keun Soo Yim <yim@google.com> | 2018-01-23 22:26:15 +0000 |
| commit | 8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a (patch) | |
| tree | f2d10f1500606805c4f69de55f8c4fc19a7c2454 /media | |
| parent | 0a542276f8e4b776a897683c169f6c5b068b0af7 (diff) | |
| download | platform_hardware_interfaces-8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a.tar.gz platform_hardware_interfaces-8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a.tar.bz2 platform_hardware_interfaces-8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a.zip | |
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 dc6270ecc1d6a3ac18b2820ef176bb4ea58fba3f)
Diffstat (limited to 'media')
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 ab18b6cc3d..9e5dde1ff7 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 3f5eff4140..2bdb06d440 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp @@ -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 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 cd6eaf5632..bbe08435da 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); |