commit 7ec7cefa253e3bb9124b067a2a147cec28708a3d
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed Nov 25 21:22:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 25 21:22:14 2020 +0000
tree 5528b1df3664a0dc9238d08dcc06e005110dde17
parent a4dcc335694373435f064bea74c1cd439ef82bc8
parent 25811d2e8be063e1b728b3e8508966ce04b38ba5

Merge "Snap for 6995593 from 29de667ef3e0ed6a9fbbfd1d150c37b39350acc4 to android11-tests-release" into android11-tests-release

media/libstagefright/omx/1.0/OmxStore.cpp

diff --git a/media/libstagefright/omx/1.0/OmxStore.cpp b/media/libstagefright/omx/1.0/OmxStore.cpp
index 67f478e..b5c1166 100644
--- a/media/libstagefright/omx/1.0/OmxStore.cpp
+++ b/media/libstagefright/omx/1.0/OmxStore.cpp
@@ -54,6 +54,24 @@
         });
     }
 
+    if (!nodes.empty()) {
+        auto anyNode = nodes.cbegin();
+        std::string::const_iterator first = anyNode->cbegin();
+        std::string::const_iterator last = anyNode->cend();
+        for (const std::string &name : nodes) {
+            std::string::const_iterator it1 = first;
+            for (std::string::const_iterator it2 = name.cbegin();
+                    it1 != last && it2 != name.cend() && tolower(*it1) == tolower(*it2);
+                    ++it1, ++it2) {
+            }
+            last = it1;
+        }
+        mPrefix = std::string(first, last);
+        LOG(INFO) << "omx common prefix: '" << mPrefix.c_str() << "'";
+    } else {
+        LOG(INFO) << "omx common prefix: no nodes";
+    }
+
     MediaCodecsXmlParser parser;
     parser.parseXmlFilesInSearchDirs(xmlNames, searchDirs);
     if (profilingResultsXmlPath != nullptr) {
@@ -112,8 +130,6 @@
         mRoleList[i] = std::move(role);
         ++i;
     }
-
-    mPrefix = parser.getCommonPrefix();
 }
 
 OmxStore::~OmxStore() {