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

Commit 9d2db5ac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make libstagefright free from libstagefright_omx" into pi-dev

parents 39947040 ef5a163e

media/libstagefright/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ cc_library_shared { 
        "libmedia_helper",

        "libstagefright_codecbase",

        "libstagefright_foundation",

        "libstagefright_omx",

        "libstagefright_omx_utils",

        "libstagefright_xmlparser",

        "libRScpp",

media/libstagefright/OmxInfoBuilder.cpp

+0 −18
Original line number Diff line number Diff line
@@ -108,24 +108,6 @@ status_t OmxInfoBuilder::buildMediaCodecList(MediaCodecListWriter* writer) { 
    if (!transStatus.isOk()) {

        ALOGE("Fail to obtain codec roles from IOmxStore.");

        return NO_INIT;

    } else if (roles.size() == 0) {

        ALOGW("IOmxStore has empty implementation. "

                "Creating a local default instance...");

        omxStore = new implementation::OmxStore();

        if (omxStore == nullptr) {

            ALOGE("Cannot create a local default instance.");

            return NO_INIT;

        }

        ALOGI("IOmxStore local default instance created.");

        transStatus = omxStore->listRoles(

                [&roles] (

                const hidl_vec<IOmxStore::RoleInfo>& inRoleList) {

                    roles = inRoleList;

                });

        if (!transStatus.isOk()) {

            ALOGE("Fail to obtain codec roles from local IOmxStore.");

            return NO_INIT;

        }

    }



    hidl_vec<IOmxStore::ServiceAttribute> serviceAttributes;