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

Merge "VTS: Remove enforce codec2 on ATV for S devices" am: 842e6219c2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2054806

Change-Id: Id16fe9b973ff934d0efb4c1d0af2ad4bb933e146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-07 03:09:45 +00:00
committed by Automerger Merge Worker
parent 256baf1478 842e6219c2
commit a5b65bd284
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
View File

@@ -24,6 +24,7 @@
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android/api-level.h> #include <android/api-level.h>
#include <VtsCoreUtil.h>
#include <android/hardware/media/omx/1.0/IOmx.h> #include <android/hardware/media/omx/1.0/IOmx.h>
#include <android/hardware/media/omx/1.0/IOmxNode.h> #include <android/hardware/media/omx/1.0/IOmxNode.h>
#include <android/hardware/media/omx/1.0/IOmxObserver.h> #include <android/hardware/media/omx/1.0/IOmxObserver.h>
@@ -377,6 +378,10 @@ static int getFirstApiLevel() {
return android::base::GetIntProperty("ro.product.first_api_level", __ANDROID_API_T__); 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. // list components and roles.
TEST_P(StoreHidlTest, OmxCodecAllowedTest) { TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
hidl_vec<IOmx::ComponentInfo> componentInfos = getComponentInfoList(omx); hidl_vec<IOmx::ComponentInfo> componentInfos = getComponentInfoList(omx);
@@ -384,9 +389,16 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) {
for (std::string role : info.mRoles) { for (std::string role : info.mRoles) {
if (role.find("video_decoder") != std::string::npos || if (role.find("video_decoder") != std::string::npos ||
role.find("video_encoder") != std::string::npos) { role.find("video_encoder") != std::string::npos) {
ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__) // Codec2 is not mandatory on Android TV devices that launched with Android S
<< " Component: " << info.mName.c_str() << " Role: " << role.c_str() if (isTV()) {
<< " not allowed for devices launching with Android S and above"; ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)
<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
<< " not allowed for devices launching with Android T and above";
} else {
ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)
<< " Component: " << info.mName.c_str() << " Role: " << role.c_str()
<< " not allowed for devices launching with Android S and above";
}
} }
if (role.find("audio_decoder") != std::string::npos || if (role.find("audio_decoder") != std::string::npos ||
role.find("audio_encoder") != std::string::npos) { role.find("audio_encoder") != std::string::npos) {