diff options
author | Pawin Vongmasa | 2018-08-10 16:30:13 -0500 |
---|---|---|
committer | android-build-merger | 2018-08-10 16:30:13 -0500 |
commit | 841940be1cebd7a650001725d900d04648bc5bc9 (patch) | |
tree | 7cfa51666240c5eae2683d9c121c1dd9c16b0464 /media/omx | |
parent | 92dc397252405b07e7ea0f921b875f97095600bf (diff) | |
parent | c0243f2ff85d3d8d897f34d063177169e736a500 (diff) | |
download | platform-hardware-interfaces-841940be1cebd7a650001725d900d04648bc5bc9.tar.gz platform-hardware-interfaces-841940be1cebd7a650001725d900d04648bc5bc9.tar.xz platform-hardware-interfaces-841940be1cebd7a650001725d900d04648bc5bc9.zip |
resolve merge conflicts of b92f1d2e1be35b331b18589a8cde81d51ddd31d6 to oreo-mr1-vts-dev
am: c0243f2ff8
Change-Id: I25bf6387a074f630cc3e10c3b265d16390e39eca
Diffstat (limited to 'media/omx')
-rw-r--r-- | media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | 10 |
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 725e2904..e851a7c1 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | |||
@@ -151,6 +151,15 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
151 | framesReceived = 0; | 151 | framesReceived = 0; |
152 | timestampUs = 0; | 152 | timestampUs = 0; |
153 | timestampDevTest = false; | 153 | timestampDevTest = false; |
154 | isSecure = false; | ||
155 | size_t suffixLen = strlen(".secure"); | ||
156 | if (strlen(gEnv->getComponent().c_str()) >= suffixLen) { | ||
157 | isSecure = | ||
158 | !strcmp(gEnv->getComponent().c_str() + | ||
159 | strlen(gEnv->getComponent().c_str()) - suffixLen, | ||
160 | ".secure"); | ||
161 | } | ||
162 | if (isSecure) disableTest = true; | ||
154 | if (disableTest) std::cout << "[ WARN ] Test Disabled \n"; | 163 | if (disableTest) std::cout << "[ WARN ] Test Disabled \n"; |
155 | } | 164 | } |
156 | 165 | ||
@@ -247,6 +256,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
247 | OMX_AUDIO_CODINGTYPE eEncoding; | 256 | OMX_AUDIO_CODINGTYPE eEncoding; |
248 | bool disableTest; | 257 | bool disableTest; |
249 | bool eosFlag; | 258 | bool eosFlag; |
259 | bool isSecure; | ||
250 | uint32_t framesReceived; | 260 | uint32_t framesReceived; |
251 | uint64_t timestampUs; | 261 | uint64_t timestampUs; |
252 | ::android::List<uint64_t> timestampUslist; | 262 | ::android::List<uint64_t> timestampUslist; |