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

Commit 5a4ea576 authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "libnativewindow: remove software flex pixel formats from VNDK" into pi-dev 

am: 93ec3a87

Change-Id: Id504b47865c5953393138ec428d70639fd4378b4
parents 426b823a 93ec3a87

libs/nativewindow/AHardwareBuffer.cpp

+0 −12
Original line number Diff line number Diff line
@@ -343,14 +343,6 @@ bool AHardwareBuffer_isValidPixelFormat(uint32_t format) { 
            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_YCBCR_420_888 == AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420,

            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_YCBCR_422_888 == AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_422,

            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_YCBCR_444_888 == AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_444,

            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_FLEX_RGB_888 == AHARDWAREBUFFER_FORMAT_FLEX_R8G8B8,

            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_FLEX_RGBA_8888 == AHARDWAREBUFFER_FORMAT_FLEX_R8G8B8A8,

            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_YCBCR_422_SP == AHARDWAREBUFFER_FORMAT_YCbCr_422_SP,

            "HAL and AHardwareBuffer pixel format don't match");

    static_assert(HAL_PIXEL_FORMAT_YCRCB_420_SP == AHARDWAREBUFFER_FORMAT_YCrCb_420_SP,
@@ -383,10 +375,6 @@ bool AHardwareBuffer_isValidPixelFormat(uint32_t format) { 
        case AHARDWAREBUFFER_FORMAT_RAW_OPAQUE:

        case AHARDWAREBUFFER_FORMAT_IMPLEMENTATION_DEFINED:

        case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420:

        case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_422:

        case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_444:

        case AHARDWAREBUFFER_FORMAT_FLEX_R8G8B8:

        case AHARDWAREBUFFER_FORMAT_FLEX_R8G8B8A8:

        case AHARDWAREBUFFER_FORMAT_YCbCr_422_SP:

        case AHARDWAREBUFFER_FORMAT_YCrCb_420_SP:

        case AHARDWAREBUFFER_FORMAT_YCbCr_422_I:

libs/nativewindow/include/vndk/hardware_buffer.h

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ enum { 
    AHARDWAREBUFFER_FORMAT_IMPLEMENTATION_DEFINED   = 0x22,

    /* same as HAL_PIXEL_FORMAT_YCBCR_420_888 */

    AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420             = 0x23,

    /* same as HAL_PIXEL_FORMAT_YCBCR_422_888 */

    AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_422             = 0x27,

    /* same as HAL_PIXEL_FORMAT_YCBCR_444_888 */

    AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_444             = 0x28,

    /* same as HAL_PIXEL_FORMAT_FLEX_RGB_888 */

    AHARDWAREBUFFER_FORMAT_FLEX_R8G8B8              = 0x29,

    /* same as HAL_PIXEL_FORMAT_FLEX_RGBA_8888 */

    AHARDWAREBUFFER_FORMAT_FLEX_R8G8B8A8            = 0x2A,

    /* same as HAL_PIXEL_FORMAT_YCBCR_422_SP */

    AHARDWAREBUFFER_FORMAT_YCbCr_422_SP             = 0x10,

    /* same as HAL_PIXEL_FORMAT_YCRCB_420_SP */