Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev

Browse Source 
am: c0243f2ff8

Change-Id: Ic39fb2e88c6d0d1c1185dae1fab6d9c42a624187
This commit is contained in:
Pawin Vongmasa
2018-07-13 01:40:58 -07:00
committed by android-build-merger
parent 54eb2c126d c0243f2ff8
commit fedde0ea52
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
View File

@@ -225,6 +225,15 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
framesReceived = 0; framesReceived = 0;
timestampUs = 0; timestampUs = 0;
timestampDevTest = false; timestampDevTest = false;
isSecure = false;
size_t suffixLen = strlen(".secure");
if (strlen(gEnv->getComponent().c_str()) >= suffixLen) {
isSecure =
!strcmp(gEnv->getComponent().c_str() +
strlen(gEnv->getComponent().c_str()) - suffixLen,
".secure");
}
if (isSecure) disableTest = true;
if (disableTest) std::cout << "[ WARN ] Test Disabled \n"; if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
} }
@@ -321,6 +330,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
OMX_AUDIO_CODINGTYPE eEncoding; OMX_AUDIO_CODINGTYPE eEncoding;
bool disableTest; bool disableTest;
bool eosFlag; bool eosFlag;
bool isSecure;
uint32_t framesReceived; uint32_t framesReceived;
uint64_t timestampUs; uint64_t timestampUs;
::android::List<uint64_t> timestampUslist; ::android::List<uint64_t> timestampUslist;