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

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

Merge "CodecCapabilities NDK: Fix implementation issues." into main am: 8ba47fe4 am: 5fe3e7de 

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



Change-Id: I00f82d168e5305bc0eecffefed726438771351d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf45ea7b 5fe3e7de

media/ndk/NdkMediaCodecInfo.cpp

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

    }





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

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

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

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

}

}





EXPORT

EXPORT

media/ndk/NdkMediaCodecStore.cpp

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

EXPORT

media_status_t AMediaCodecStore_getSupportedMediaTypes(

media_status_t AMediaCodecStore_getSupportedMediaTypes(

        const AMediaCodecSupportedMediaType **outMediaTypes, size_t *outCount) {

        const AMediaCodecSupportedMediaType **outMediaTypes, size_t *outCount) {

    if (outMediaTypes == nullptr) {

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

        return AMEDIA_ERROR_INVALID_PARAMETER;

        return AMEDIA_ERROR_INVALID_PARAMETER;

    }

    }