| commit | 16fa677530857d2e68bec75b76f735a3a8609327 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 17 00:56:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 00:56:17 2021 +0000 |
| tree | 43bd466246db6fe3497544c2f2b7287095d1b9ef | |
| parent | 38733d5ad17ff57a3ff2713fada450e3761f4a0a [diff] | |
| parent | 1263ac8eb88a8e1a9d561363674cdc8eb5fe39db [diff] |
Merge "omx: validate only standard OMX roles" into sc-dev am: af592fb124 am: 1263ac8eb8 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15528285 Change-Id: I9d18609d1e777f114e62a93ed0f714238ec9b50c
diff --git a/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp b/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp index e73196c..8699de3 100644 --- a/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp +++ b/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
@@ -264,11 +264,13 @@ // Make sure role name follows expected format based on type and // isEncoder - const std::string role_name( - ::android::GetComponentRole(role.isEncoder, role.type.c_str())); - EXPECT_EQ(role_name, role.role) << "Role \"" << role.role << "\" does not match " - << (role.isEncoder ? "an encoder " : "a decoder ") - << "for mime type \"" << role.type << "."; + const char* role_name = ::android::GetComponentRole(role.isEncoder, role.type.c_str()); + if (role_name != nullptr) { + EXPECT_EQ(std::string(role_name), role.role) + << "Role \"" << role.role << "\" does not match " + << (role.isEncoder ? "an encoder " : "a decoder ") << "for media type \"" + << role.type << "."; + } // Check the nodes for this role std::set<const std::string> nodeKeys;