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

Commit 2384e3d8 authored by Jason Macnak's avatar Jason Macnak Committed by Automerger Merge Worker
Browse files

Merge "Add AHARDWAREBUFFER_FORMAT_YCBCR_P010" am: 53cf8183 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1982996

Change-Id: I7c5c407a7baa4fd8104bc58a8412191c6f46d3aa
parents 37b03061 53cf8183

libs/nativewindow/AHardwareBuffer.cpp

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

    static_assert(HAL_PIXEL_FORMAT_YCBCR_422_I == AHARDWAREBUFFER_FORMAT_YCbCr_422_I,

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

    static_assert(HAL_PIXEL_FORMAT_YCBCR_P010 == AHARDWAREBUFFER_FORMAT_YCbCr_P010,

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



    switch (format) {

        case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
@@ -617,6 +619,7 @@ bool AHardwareBuffer_isValidPixelFormat(uint32_t format) { 
        case AHARDWAREBUFFER_FORMAT_YCbCr_422_SP:

        case AHARDWAREBUFFER_FORMAT_YCrCb_420_SP:

        case AHARDWAREBUFFER_FORMAT_YCbCr_422_I:

        case AHARDWAREBUFFER_FORMAT_YCbCr_P010:

            return true;



        default:
@@ -633,6 +636,7 @@ bool AHardwareBuffer_formatIsYuv(uint32_t format) { 
        case AHARDWAREBUFFER_FORMAT_YCbCr_422_SP:

        case AHARDWAREBUFFER_FORMAT_YCrCb_420_SP:

        case AHARDWAREBUFFER_FORMAT_YCbCr_422_I:

        case AHARDWAREBUFFER_FORMAT_YCbCr_P010:

            return true;

        default:

            return false;

libs/nativewindow/include/android/hardware_buffer.h

+8 −0
Original line number Diff line number Diff line
@@ -158,6 +158,14 @@ enum AHardwareBuffer_Format { 
     * cube-maps or multi-layered textures.

     */

    AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420             = 0x23,



    /**

     * YUV P010 format.

     * Must have an even width and height. Can be accessed in OpenGL

     * shaders through an external sampler. Does not support mip-maps

     * cube-maps or multi-layered textures.

     */

    AHARDWAREBUFFER_FORMAT_YCbCr_P010               = 0x36,

};



/**