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

6 years ago · 46ba387b02
parent 6497af909a 3a31de26d3
commit 46ba387b02
1 changed files with 3 additions and 1 deletions
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@ -1943,7 +1943,9 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
                        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;