summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawin Vongmasa2018-07-12 01:22:17 -0500
committerPawin Vongmasa2018-07-12 01:29:14 -0500
commitc0243f2ff85d3d8d897f34d063177169e736a500 (patch)
treefd09cd3ac28593b3fa9bc148d9c4b6ee0061e9e3 /media/omx/1.0
parent70d13c2ad31cf8e9bcf2d9c81e0161ba3295cc1e (diff)
parentb92f1d2e1be35b331b18589a8cde81d51ddd31d6 (diff)
downloadplatform-hardware-interfaces-c0243f2ff85d3d8d897f34d063177169e736a500.tar.gz
platform-hardware-interfaces-c0243f2ff85d3d8d897f34d063177169e736a500.tar.xz
platform-hardware-interfaces-c0243f2ff85d3d8d897f34d063177169e736a500.zip
resolve merge conflicts of b92f1d2e1be35b331b18589a8cde81d51ddd31d6 to oreo-mr1-vts-dev
Test: make vts -j123 && vts-tradefed run commandAndExit vts \ --skip-all-system-status-check \ --skip-preconditions -m VtsHalMediaOmxV1_0Host \ -l INFO Bug: 70933963 Change-Id: I38f6309b638e604403dba15fa1fe1022b298c5b2
Diffstat (limited to 'media/omx/1.0')
-rw-r--r--media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp10
1 files changed, 10 insertions, 0 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 38cdcd65..0b661c94 100644
--- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
+++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
@@ -225,6 +225,15 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
225 framesReceived = 0; 225 framesReceived = 0;
226 timestampUs = 0; 226 timestampUs = 0;
227 timestampDevTest = false; 227 timestampDevTest = false;
228 isSecure = false;
229 size_t suffixLen = strlen(".secure");
230 if (strlen(gEnv->getComponent().c_str()) >= suffixLen) {
231 isSecure =
232 !strcmp(gEnv->getComponent().c_str() +
233 strlen(gEnv->getComponent().c_str()) - suffixLen,
234 ".secure");
235 }
236 if (isSecure) disableTest = true;
228 if (disableTest) std::cout << "[ WARN ] Test Disabled \n"; 237 if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
229 } 238 }
230 239
@@ -321,6 +330,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
321 OMX_AUDIO_CODINGTYPE eEncoding; 330 OMX_AUDIO_CODINGTYPE eEncoding;
322 bool disableTest; 331 bool disableTest;
323 bool eosFlag; 332 bool eosFlag;
333 bool isSecure;
324 uint32_t framesReceived; 334 uint32_t framesReceived;
325 uint64_t timestampUs; 335 uint64_t timestampUs;
326 ::android::List<uint64_t> timestampUslist; 336 ::android::List<uint64_t> timestampUslist;