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

Commit 314aee6e authored by Bo Hu's avatar Bo Hu Committed by Automerger Merge Worker
Browse files

Merge "codecs: ignore failed codec builder" am: 20c1f934 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I869d4bbb665a2a865dda4a803ed97dffe0ea9143
parents 4892544e 20c1f934

media/libstagefright/MediaCodecList.cpp

+6 −3
Original line number Diff line number Diff line
@@ -209,9 +209,12 @@ MediaCodecList::MediaCodecList(std::vector<MediaCodecListBuilderBase*> builders) 
            ALOGD("ignored a null builder");

            continue;

        }

        mInitCheck = builder->buildMediaCodecList(&writer);

        if (mInitCheck != OK) {

            break;

        auto currentCheck = builder->buildMediaCodecList(&writer);

        if (currentCheck != OK) {

            ALOGD("ignored failed builder");

            continue;

        } else {

            mInitCheck = currentCheck;

        }

    }

    writer.writeGlobalSettings(mGlobalSettings);

media/libstagefright/include/media/stagefright/MediaCodecList.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ private: 
    static sp<IMediaCodecList> sCodecList;

    static sp<IMediaCodecList> sRemoteList;



    status_t mInitCheck;

    status_t mInitCheck{NO_INIT};



    sp<AMessage> mGlobalSettings;

    std::vector<sp<MediaCodecInfo> > mCodecInfos;