Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 597c1c00 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "stagefright: move all codecs into codec process unless excluded" into nyc-dev 

am: 77404e1a

* commit '77404e1a':
  stagefright: move all codecs into codec process unless excluded

Change-Id: I0b01c2946157371b0f6f72c6aa048f8502b63333
parents 66d77de0 77404e1a

media/libstagefright/OMXClient.cpp

+2 −0
Original line number Diff line number Diff line
@@ -207,12 +207,14 @@ bool MuxOMX::isLocalNode_l(node_id node) const { 
// static

MuxOMX::node_location MuxOMX::getPreferredCodecLocation(const char *name) {

    if (sCodecProcessEnabled) {

        // all codecs go to codec process unless excluded using system property, in which case

        // all non-secure decoders, OMX.google.* codecs and encoders can go in the codec process

        // (non-OMX.google.* encoders can be excluded using system property.)

        if ((strcasestr(name, "decoder")

                        && strcasestr(name, ".secure") != name + strlen(name) - 7)

                || (strcasestr(name, "encoder")

                        && !property_get_bool("media.stagefright.legacyencoder", false))

                || !property_get_bool("media.stagefright.less-secure", false)

                || !strncasecmp(name, "OMX.google.", 11)) {

            return CODECPROCESS;

        }