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

Commit 4b31e4fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Codec2 vndk: fix typo in C2AllocatorGralloc" into main am: 45aaf270 

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



Change-Id: Idec7e25b4d366399b6eca4829877649043ae2263
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec49efbe 45aaf270

media/codec2/vndk/C2AllocatorGralloc.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -939,7 +939,7 @@ uint32_t ExtractFormatFromCodec2GrallocHandle(const C2Handle *const handle) { 
    return 0;

    return 0;

}

}





bool EXtractMetadataFromCodec2GrallocHandle(

bool ExtractMetadataFromCodec2GrallocHandle(

        const C2Handle *const handle,

        const C2Handle *const handle,

        uint32_t *width, uint32_t *height, uint32_t *format, uint64_t *usage, uint32_t *stride) {

        uint32_t *width, uint32_t *height, uint32_t *format, uint64_t *usage, uint32_t *stride) {

    if (handle == nullptr) {

    if (handle == nullptr) {
@@ -959,7 +959,7 @@ bool EXtractMetadataFromCodec2GrallocHandle( 
        (void)C2HandleAhwb::Import(handle, width, height, format, usage, stride, &origId);

        (void)C2HandleAhwb::Import(handle, width, height, format, usage, stride, &origId);

        return true;

        return true;

    }

    }

    ALOGE("EXtractMetadata from non compatible handle");

    ALOGE("ExtractMetadata from non compatible handle");

    return false;

    return false;

}

}