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

Commit 7d8f0b61 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "isFormatSupported() cosmetic changes" into udc-mainline-prod am: 08e69fd6 

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



Change-Id: Ib07b7ede293870962f9261ea7fd64798151dedc5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22ed4b26 08e69fd6

media/codec2/sfplugin/utils/Codec2CommonUtils.cpp

+6 −6
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ bool isHalPixelFormatSupported(AHardwareBuffer_Format format) { 
    }



    // Default scenario --- the consumer is display or GPU

    const AHardwareBuffer_Desc desc = {

    const AHardwareBuffer_Desc consumableForDisplayOrGpu = {

            .width = 320,

            .height = 240,

            .format = format,
@@ -98,7 +98,7 @@ bool isHalPixelFormatSupported(AHardwareBuffer_Format format) { 
    };



    // The consumer is a HW encoder

    const AHardwareBuffer_Desc descHwEncoder = {

    const AHardwareBuffer_Desc consumableForHwEncoder = {

            .width = 320,

            .height = 240,

            .format = format,
@@ -114,7 +114,7 @@ bool isHalPixelFormatSupported(AHardwareBuffer_Format format) { 
    };



    // The consumer is a SW encoder

    const AHardwareBuffer_Desc descSwEncoder = {

    const AHardwareBuffer_Desc consumableForSwEncoder = {

            .width = 320,

            .height = 240,

            .format = format,
@@ -128,9 +128,9 @@ bool isHalPixelFormatSupported(AHardwareBuffer_Format format) { 
            .rfu1 = 0,

    };



    return AHardwareBuffer_isSupported(&desc)

            && AHardwareBuffer_isSupported(&descHwEncoder)

            && AHardwareBuffer_isSupported(&descSwEncoder);

    return AHardwareBuffer_isSupported(&consumableForDisplayOrGpu)

            && AHardwareBuffer_isSupported(&consumableForHwEncoder)

            && AHardwareBuffer_isSupported(&consumableForSwEncoder);

}



}  // namespace android