Merge "VtsHalMediaOmx: fix OmxCodecAllowedTest to match requirement" am: 28d4f75dd0
am: 7d9873d019
am: 64da566f72
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2243207 Change-Id: I5d267e871c14292c0de71ec1d63825b995027f9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4a619462af
1 changed files with 10 additions and 15 deletions
21
media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
Executable file → Normal file
21
media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
Executable file → Normal file
|
@ -374,21 +374,16 @@ TEST_P(StoreHidlTest, ListRoles) {
|
|||
}
|
||||
}
|
||||
|
||||
static int getFirstApiLevel() {
|
||||
int boardApiLevel = android::base::GetIntProperty("ro.board.first_api_level", 0);
|
||||
if (boardApiLevel != 0) {
|
||||
return boardApiLevel;
|
||||
}
|
||||
|
||||
return android::base::GetIntProperty("ro.product.first_api_level", __ANDROID_API_T__);
|
||||
}
|
||||
|
||||
static bool isTV() {
|
||||
return testing::deviceSupportsFeature("android.software.leanback");
|
||||
}
|
||||
|
||||
// list components and roles.
|
||||
TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
|
||||
static int sBoardFirstApiLevel = android::base::GetIntProperty("ro.board.first_api_level", 0);
|
||||
if (sBoardFirstApiLevel == 0) {
|
||||
GTEST_SKIP() << "board first API level not detected";
|
||||
}
|
||||
hidl_vec<IOmx::ComponentInfo> componentInfos = getComponentInfoList(omx);
|
||||
for (IOmx::ComponentInfo info : componentInfos) {
|
||||
for (std::string role : info.mRoles) {
|
||||
|
@ -396,19 +391,19 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
|
|||
role.find("video_encoder") != std::string::npos) {
|
||||
// Codec2 is not mandatory on Android TV devices that launched with Android S
|
||||
if (isTV()) {
|
||||
ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)
|
||||
ASSERT_LT(sBoardFirstApiLevel, __ANDROID_API_T__)
|
||||
<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
|
||||
<< " not allowed for devices launching with Android T and above";
|
||||
} else {
|
||||
std::string codecName = info.mName;
|
||||
bool isAndroidCodec = (codecName.rfind("OMX.google", 0) != std::string::npos);
|
||||
if (isAndroidCodec && (getFirstApiLevel() <= __ANDROID_API_S__)) {
|
||||
if (isAndroidCodec && (sBoardFirstApiLevel <= __ANDROID_API_S__)) {
|
||||
// refer b/230582620
|
||||
// S AOSP build did not remove the OMX.google video codecs
|
||||
// so it is infeasible to require no OMX.google.* video codecs
|
||||
// on S launching devices
|
||||
} else {
|
||||
ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)
|
||||
ASSERT_LT(sBoardFirstApiLevel, __ANDROID_API_S__)
|
||||
<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
|
||||
<< " not allowed for devices launching with Android S and above";
|
||||
}
|
||||
|
@ -416,7 +411,7 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
|
|||
}
|
||||
if (role.find("audio_decoder") != std::string::npos ||
|
||||
role.find("audio_encoder") != std::string::npos) {
|
||||
ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)
|
||||
ASSERT_LT(sBoardFirstApiLevel, __ANDROID_API_T__)
|
||||
<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
|
||||
<< " not allowed for devices launching with Android T and above";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue