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

Commit ecbb3324 authored by Chia-I Wu's avatar Chia-I Wu Committed by Android (Google) Code Review
Browse files

Merge "graphics: move some flex pixel formats to graphcis-sw.h" into pi-dev

parents 23d45d1c 94f641c3

libsystem/include/system/graphics-base.h

+0 −8
Original line number Diff line number Diff line
@@ -4,12 +4,4 @@ 
#include "graphics-base-v1.0.h"

#include "graphics-base-v1.1.h"



/* Legacy formats not in the HAL definitions. */

typedef enum {

    HAL_PIXEL_FORMAT_YCBCR_422_888 = 39,   // 0x27

    HAL_PIXEL_FORMAT_YCBCR_444_888 = 40,   // 0x28

    HAL_PIXEL_FORMAT_FLEX_RGB_888 = 41,    // 0x29

    HAL_PIXEL_FORMAT_FLEX_RGBA_8888 = 42,  // 0x2A

} android_pixel_format_legacy_t;



#endif  // SYSTEM_CORE_GRAPHICS_BASE_H_

libsystem/include/system/graphics-sw.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#ifndef SYSTEM_CORE_GRAPHICS_SW_H_

#define SYSTEM_CORE_GRAPHICS_SW_H_



/* Software formats not in the HAL definitions. */

typedef enum {

    HAL_PIXEL_FORMAT_YCBCR_422_888 = 39,   // 0x27

    HAL_PIXEL_FORMAT_YCBCR_444_888 = 40,   // 0x28

    HAL_PIXEL_FORMAT_FLEX_RGB_888 = 41,    // 0x29

    HAL_PIXEL_FORMAT_FLEX_RGBA_8888 = 42,  // 0x2A

} android_pixel_format_sw_t;



/* for compatibility */

#define HAL_PIXEL_FORMAT_YCbCr_422_888 HAL_PIXEL_FORMAT_YCBCR_422_888

#define HAL_PIXEL_FORMAT_YCbCr_444_888 HAL_PIXEL_FORMAT_YCBCR_444_888



#endif  // SYSTEM_CORE_GRAPHICS_SW_H_

libsystem/include/system/graphics.h

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ extern "C" { 


/* for compatibility */

#define HAL_PIXEL_FORMAT_YCbCr_420_888 HAL_PIXEL_FORMAT_YCBCR_420_888

#define HAL_PIXEL_FORMAT_YCbCr_422_888 HAL_PIXEL_FORMAT_YCBCR_422_888

#define HAL_PIXEL_FORMAT_YCbCr_444_888 HAL_PIXEL_FORMAT_YCBCR_444_888

#define HAL_PIXEL_FORMAT_YCbCr_422_SP HAL_PIXEL_FORMAT_YCBCR_422_SP

#define HAL_PIXEL_FORMAT_YCrCb_420_SP HAL_PIXEL_FORMAT_YCRCB_420_SP

#define HAL_PIXEL_FORMAT_YCbCr_422_I HAL_PIXEL_FORMAT_YCBCR_422_I