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

Commit 03cbf17a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "skip omx codecs check when no needed" into tm-dev am: c94dace0 am: 01df3c81 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18092031



Change-Id: I0501157392f3995ecd94b3969c2966c3a4696b4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72630f69 01df3c81

media/libstagefright/omx/OMXStore.cpp

+32 −0
Original line number Diff line number Diff line
@@ -99,6 +99,15 @@ void OMXStore::addPlugin(const char *libname) { 
    }

}



static int getFirstApiLevel() {

    int boardApiLevel = android::base::GetIntProperty("ro.board.first_api_level", 0);

    if (boardApiLevel != 0) {

        return boardApiLevel;

    }



    return android::base::GetIntProperty("ro.product.first_api_level", __ANDROID_API_T__);

}



void OMXStore::addPlugin(OMXPluginBase *plugin) {

    Mutex::Autolock autoLock(mLock);
@@ -110,6 +119,29 @@ void OMXStore::addPlugin(OMXPluginBase *plugin) { 
                    name, sizeof(name), index++)) == OMX_ErrorNone) {

        String8 name8(name);



        Vector<String8> roles;

        OMX_ERRORTYPE err = plugin->getRolesOfComponent(name, &roles);

        if (err == OMX_ErrorNone) {

            bool skip = false;

            for (String8 role : roles) {

                if (role.find("video_decoder") != -1 || role.find("video_encoder") != -1) {

                    if (getFirstApiLevel() >= __ANDROID_API_S__) {

                        skip = true;

                        break;

                    }

                }

                if (role.find("audio_decoder") != -1 || role.find("audio_encoder") != -1) {

                    if (getFirstApiLevel() >= __ANDROID_API_T__) {

                        skip = true;

                        break;

                    }

                }

            }

            if (skip) {

                continue;

            }

        }



        if (mPluginByComponentName.indexOfKey(name8) >= 0) {

            ALOGE("A component of name '%s' already exists, ignoring this one.",

                 name8.string());