| commit | df4523eb751030c9d141e28df141c0faa3d474f7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 17 01:10:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 01:10:07 2021 +0000 |
| tree | 748480a038aa6b30c12b2d190da78befc24b7641 | |
| parent | 33b809ed5f984806b336ca2a49585dbeb1a48f61 [diff] | |
| parent | c6dc6fc2a160a91327a8a1c83e34e32055422918 [diff] |
Merge "omx: validate only standard OMX roles" into sc-dev am: af592fb124 am: b08320b038 am: c6dc6fc2a1 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15528285 Change-Id: Ib4e0a432fae25060239446dea155fb36b741e8f2
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;