diff options
author | Ram Mohan M | 2017-08-30 01:26:33 -0500 |
---|---|---|
committer | Keun Soo Yim | 2018-01-23 16:26:15 -0600 |
commit | 8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a (patch) | |
tree | f2d10f1500606805c4f69de55f8c4fc19a7c2454 /media | |
parent | 0a542276f8e4b776a897683c169f6c5b068b0af7 (diff) | |
download | platform-hardware-interfaces-8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a.tar.gz platform-hardware-interfaces-8d009afdbbbc82d6c601044b7cfa7eb6c3a6e33a.tar.xz 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 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) { | |||
761 | eleInfo >> flags; | 761 | eleInfo >> flags; |
762 | eleInfo >> timestamp; | 762 | eleInfo >> timestamp; |
763 | Info.push_back({bytesCount, flags, timestamp}); | 763 | Info.push_back({bytesCount, flags, timestamp}); |
764 | if (flags != OMX_BUFFERFLAG_CODECCONFIG) | 764 | if (timestampDevTest && (flags != OMX_BUFFERFLAG_CODECCONFIG)) |
765 | timestampUslist.push_back(timestamp); | 765 | timestampUslist.push_back(timestamp); |
766 | } | 766 | } |
767 | eleInfo.close(); | 767 | eleInfo.close(); |
@@ -803,7 +803,7 @@ TEST_F(AudioDecHidlTest, DecodeTest) { | |||
803 | packedArgs audioArgs = {eEncoding, compName}; | 803 | packedArgs audioArgs = {eEncoding, compName}; |
804 | testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, nullptr, | 804 | testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, nullptr, |
805 | portReconfiguration, kPortIndexInput, kPortIndexOutput, &audioArgs); | 805 | portReconfiguration, kPortIndexInput, kPortIndexOutput, &audioArgs); |
806 | EXPECT_EQ(timestampUslist.empty(), true); | 806 | if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true); |
807 | // set state to idle | 807 | // set state to idle |
808 | changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); | 808 | changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); |
809 | // set state to executing | 809 | // 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 3f5eff41..2bdb06d4 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) { | |||
921 | eleInfo >> flags; | 921 | eleInfo >> flags; |
922 | eleInfo >> timestamp; | 922 | eleInfo >> timestamp; |
923 | Info.push_back({bytesCount, flags, timestamp}); | 923 | Info.push_back({bytesCount, flags, timestamp}); |
924 | if (flags != OMX_BUFFERFLAG_CODECCONFIG) | 924 | if (timestampDevTest && (flags != OMX_BUFFERFLAG_CODECCONFIG)) |
925 | timestampUslist.push_back(timestamp); | 925 | timestampUslist.push_back(timestamp); |
926 | if (maxBytesCount < bytesCount) maxBytesCount = bytesCount; | 926 | if (maxBytesCount < bytesCount) maxBytesCount = bytesCount; |
927 | } | 927 | } |
@@ -995,7 +995,7 @@ TEST_F(VideoDecHidlTest, DecodeTest) { | |||
995 | kPortIndexInput, kPortIndexOutput, portMode[1]); | 995 | kPortIndexInput, kPortIndexOutput, portMode[1]); |
996 | testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, portMode, | 996 | testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, portMode, |
997 | portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr); | 997 | portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr); |
998 | EXPECT_EQ(timestampUslist.empty(), true); | 998 | if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true); |
999 | // set state to idle | 999 | // set state to idle |
1000 | changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); | 1000 | changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); |
1001 | // set state to executing | 1001 | // 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) { | |||
1286 | eleStream.close(); | 1286 | eleStream.close(); |
1287 | waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer); | 1287 | waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer); |
1288 | testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag); | 1288 | testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag); |
1289 | EXPECT_EQ(timestampUslist.empty(), true); | 1289 | if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true); |
1290 | 1290 | ||
1291 | // set state to idle | 1291 | // set state to idle |
1292 | changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); | 1292 | changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); |