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

Commit 30328e6c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "isFormatSupported() cosmetic changes" into main am: 37acb044 am:... 

Merge "isFormatSupported() cosmetic changes" into main am: 37acb044 am: cf60ff40 am: b2f37ccb am: a9653718 am: 6403e54f

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



Change-Id: I10cabf2cb627b1db3126caf48d89f7e651b9fa43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01816b29 6403e54f

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