summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Mohan M2017-08-30 01:26:33 -0500
committerPawin Vongmasa2017-09-02 03:39:07 -0500
commitdc6270ecc1d6a3ac18b2820ef176bb4ea58fba3f (patch)
treec516edf1518353c6b4e85523a8a0a7ea2e0f00dc /media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
parenteb9e25a3e265a984a1c114a1925dc33bf445f28f (diff)
downloadplatform-hardware-interfaces-dc6270ecc1d6a3ac18b2820ef176bb4ea58fba3f.tar.gz
platform-hardware-interfaces-dc6270ecc1d6a3ac18b2820ef176bb4ea58fba3f.tar.xz
platform-hardware-interfaces-dc6270ecc1d6a3ac18b2820ef176bb4ea58fba3f.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
Diffstat (limited to 'media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp')
-rw-r--r--media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp4
1 files changed, 2 insertions, 2 deletions
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) {
777 eleInfo >> flags; 777 eleInfo >> flags;
778 eleInfo >> timestamp; 778 eleInfo >> timestamp;
779 Info.push_back({bytesCount, flags, timestamp}); 779 Info.push_back({bytesCount, flags, timestamp});
780 if (flags != OMX_BUFFERFLAG_CODECCONFIG) 780 if (timestampDevTest && (flags != OMX_BUFFERFLAG_CODECCONFIG))
781 timestampUslist.push_back(timestamp); 781 timestampUslist.push_back(timestamp);
782 } 782 }
783 eleInfo.close(); 783 eleInfo.close();
@@ -834,7 +834,7 @@ TEST_F(VideoDecHidlTest, DecodeTest) {
834 kPortIndexInput, kPortIndexOutput, portMode[1]); 834 kPortIndexInput, kPortIndexOutput, portMode[1]);
835 testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, portMode, 835 testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag, portMode,
836 portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr); 836 portReconfiguration, kPortIndexInput, kPortIndexOutput, nullptr);
837 EXPECT_EQ(timestampUslist.empty(), true); 837 if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true);
838 // set state to idle 838 // set state to idle
839 changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer); 839 changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
840 // set state to executing 840 // set state to executing