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

Commit 8ba47fe4 authored by Songyue Han's avatar Songyue Han Committed by Gerrit Code Review
Browse files

Merge "CodecCapabilities NDK: Fix implementation issues." into main

parents d87c8a14 ddbccba6

media/ndk/NdkMediaCodecInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ int32_t AMediaCodecInfo_isVendor(const AMediaCodecInfo *info) { 
    }



    int32_t attributes = info->mInfo->getAttributes();

    return (attributes & android::MediaCodecInfo::kFlagIsVendor);

    return (attributes & android::MediaCodecInfo::kFlagIsVendor) ? 1 : 0;

}



EXPORT

media/ndk/NdkMediaCodecStore.cpp

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ extern "C" { 
EXPORT

media_status_t AMediaCodecStore_getSupportedMediaTypes(

        const AMediaCodecSupportedMediaType **outMediaTypes, size_t *outCount) {

    if (outMediaTypes == nullptr) {

    if (outMediaTypes == nullptr || outCount == nullptr) {

        return AMEDIA_ERROR_INVALID_PARAMETER;

    }