diff options
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/OMXClient.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 778dfa5..5a43caf 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1245,6 +1245,7 @@ void AwesomePlayer::initRenderer_l() { setVideoScalingMode_l(mVideoScalingMode); if (USE_SURFACE_ALLOC && !strncmp(component, "OMX.", 4) + && strncmp(component, "OMX.ffmpeg.", 11) && strncmp(component, "OMX.google.", 11)) { // Hardware decoders avoid the CPU color conversion by decoding // directly to ANativeBuffers, so we must use a renderer that diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp index ac925f7..eff07f9 100644 --- a/media/libstagefright/OMXClient.cpp +++ b/media/libstagefright/OMXClient.cpp @@ -189,7 +189,7 @@ bool MuxOMX::CanLiveLocally(const char *name) { return false; #else // 32 bit processes run only OMX.google.* components locally - return !strncasecmp(name, "OMX.google.", 11); + return !strncasecmp(name, "OMX.google.", 11) || !strncasecmp(name, "OMX.ffmpeg.", 11); #endif } diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 80026b1..6bd54f1 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -155,7 +155,8 @@ static void InitOMXParams(T *params) { } static bool IsSoftwareCodec(const char *componentName) { - if (!strncmp("OMX.google.", componentName, 11)) { + if (!strncmp("OMX.google.", componentName, 11) + || !strncmp("OMX.ffmpeg.", componentName, 11)) { return true; } |