commit 46ba387b026a3325a254f014f0f41548afba04c5
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 23 21:59:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 23 21:59:28 2018 +0000
tree 361fb0bd7c22ee7dd3000bae696b85d4a7e417ce
parent 6497af909a1218a842ae65f12f7d1f4c98159580
parent 3a31de26d3d82fddd26fcbe115c94013e7204094

Merge "stagefright: limit software renderer for actual OMX components" into pi-dev

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 5361159..353e407 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1943,7 +1943,9 @@
                         mAnalyticsItem->setCString(kCodecCodec, mComponentName.c_str());
                     }
 
-                    if (mComponentName.startsWith("OMX.google.")) {
+                    const char *owner = mCodecInfo->getOwnerName();
+                    if (mComponentName.startsWith("OMX.google.")
+                            && (owner == nullptr || strncmp(owner, "default", 8) == 0)) {
                         mFlags |= kFlagUsesSoftwareRenderer;
                     } else {
                         mFlags &= ~kFlagUsesSoftwareRenderer;