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

Commit 8b67a8af authored by Songyue Han's avatar Songyue Han Committed by Automerger Merge Worker
Browse files

Merge "CodecCapabilities NDK: Fix endocder|decoder check for null format... 

Merge "CodecCapabilities NDK: Fix endocder|decoder check for null format case." into main am: 968f7552

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



Change-Id: I8666b7bd407f2707b3de0532ad0d325887501477
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a01ca57 968f7552

media/ndk/NdkMediaCodecStore.cpp

+2 −8
Original line number Diff line number Diff line
@@ -154,12 +154,6 @@ static void initCodecInfoMap() { 
    }

}



static bool codecHandlesFormat(const AMediaCodecInfo &codecInfo,

        sp<AMessage> format, bool isEncoder) {

    return codecInfo.mCodecCaps->isEncoder() == isEncoder

            && codecInfo.mCodecCaps->isFormatSupported(format);

}



static media_status_t findNextCodecForFormat(

        const AMediaFormat *format, bool isEncoder, const AMediaCodecInfo **outCodecInfo) {

    if (outCodecInfo == nullptr) {
@@ -192,8 +186,8 @@ static media_status_t findNextCodecForFormat( 


    bool found = *outCodecInfo == nullptr;

    for (const AMediaCodecInfo &info : *infos) {

        if (found && (format == nullptr

                || codecHandlesFormat(info, nativeFormat, isEncoder))) {

        if (found && info.mCodecCaps->isEncoder() == isEncoder

                && (format == nullptr || info.mCodecCaps->isFormatSupported(nativeFormat))) {

            *outCodecInfo = &info;

            return AMEDIA_OK;

        }