LineageOS/android_hardware_libhardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove h/w specific YUV formats from the HAL

Browse Source 
we now only support 2 "standard" yuv format in the HAL.
there is a new reserved range 0x100-0x1FF for OEMs.

Change-Id: I171fb0f8d90ded64773ac9c1e5adcab1e1f25c7f
This commit is contained in:
Mathias Agopian
2010-07-01 20:36:08 -07:00
parent 00758793ab
commit 6915eb345b
3 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/hardware/copybit.h
View File

@@ -46,10 +46,8 @@ enum {
COPYBIT_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888, COPYBIT_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
COPYBIT_FORMAT_RGBA_5551 = HAL_PIXEL_FORMAT_RGBA_5551, COPYBIT_FORMAT_RGBA_5551 = HAL_PIXEL_FORMAT_RGBA_5551,
COPYBIT_FORMAT_RGBA_4444 = HAL_PIXEL_FORMAT_RGBA_4444, COPYBIT_FORMAT_RGBA_4444 = HAL_PIXEL_FORMAT_RGBA_4444,
COPYBIT_FORMAT_YCbCr_422_SP = HAL_PIXEL_FORMAT_YCbCr_422_SP, COPYBIT_FORMAT_YCbCr_422_SP = 0x10,
COPYBIT_FORMAT_YCbCr_420_SP = HAL_PIXEL_FORMAT_YCbCr_420_SP, COPYBIT_FORMAT_YCrCb_420_SP = 0x11,
COPYBIT_FORMAT_YCrCb_422_SP = HAL_PIXEL_FORMAT_YCrCb_422_SP,
COPYBIT_FORMAT_YCrCb_420_SP = HAL_PIXEL_FORMAT_YCrCb_420_SP,
}; };
/* name for copybit_set_parameter */ /* name for copybit_set_parameter */

65
include/hardware/hardware.h
View File

@@ -130,33 +130,48 @@ enum {
HAL_PIXEL_FORMAT_BGRA_8888 = 5, HAL_PIXEL_FORMAT_BGRA_8888 = 5,
HAL_PIXEL_FORMAT_RGBA_5551 = 6, HAL_PIXEL_FORMAT_RGBA_5551 = 6,
HAL_PIXEL_FORMAT_RGBA_4444 = 7, HAL_PIXEL_FORMAT_RGBA_4444 = 7,
/* 0x8 - 0xF range unavailable */
HAL_PIXEL_FORMAT_YCbCr_422_SP = 0x10, // NV16 /* 0x8 - 0xFF range unavailable */
HAL_PIXEL_FORMAT_YCrCb_420_SP = 0x11, // NV21
HAL_PIXEL_FORMAT_YCbCr_422_P = 0x12, // IYUV /*
HAL_PIXEL_FORMAT_YCbCr_420_P = 0x13, // YUV9 * 0x100 - 0x1FF
HAL_PIXEL_FORMAT_YCbCr_422_I = 0x14, // YUY2 *
/* 0x15 reserved */ * This range is reserved for HAL implementations. OEMs can use
HAL_PIXEL_FORMAT_CbYCrY_422_I = 0x16, // UYVY * any value in this range to communicate formats between their HAL
/* 0x17 reserved */ * modules
/* 0x18 - 0x1F range unavailable */ *
HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED = 0x20, // NV12_adreno_tiled */
HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x21, // NV12
HAL_PIXEL_FORMAT_YCrCb_422_SP = 0x22, // NV61 /*
* Android YUV formats:
*
* These two formats are exposed outside of the HAL to software
* decoders and applications.
* EGLImageKHR must support them in conjunction with the
* OES_EGL_image_external extension.
*
* YV12 is a planar format comprised of a WxH Y plane followed
* by (W/2) x (H/2) Cr and Cb planes.
*
* YV16 is a planar format comprised of WxH Y, Cr and Cb planes.
*
* For both these formats, the Y plane appears first, followed by the Cr
* plane and then the Cb plane.
*
* Both formats *require* a 16 pixel alignment horizontally and vertically.
*
*/
HAL_PIXEL_FORMAT_YV12 = 0x32315659, // YCrCb 4:2:0 Planar
HAL_PIXEL_FORMAT_YV16 = 0x36315659, // YCrCb 4:2:2 Planar
/* Legacy formats (deprecated), used by ImageFormat.java */
HAL_PIXEL_FORMAT_YCbCr_422_SP = 0x10, // NV16
HAL_PIXEL_FORMAT_YCrCb_420_SP = 0x11, // NV21
HAL_PIXEL_FORMAT_YCbCr_422_I = 0x14, // YUY2
HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED = 0x20, // NV12_adreno_tiled
}; };
/* fourcc mapping for the YUV formats. see http://www.fourcc.org */
enum {
HAL_PIXEL_FORMAT_NV16 = HAL_PIXEL_FORMAT_YCbCr_422_SP,
HAL_PIXEL_FORMAT_NV21 = HAL_PIXEL_FORMAT_YCrCb_420_SP,
HAL_PIXEL_FORMAT_IYUV = HAL_PIXEL_FORMAT_YCbCr_422_P,
HAL_PIXEL_FORMAT_YUV9 = HAL_PIXEL_FORMAT_YCbCr_420_P,
HAL_PIXEL_FORMAT_YUY2 = HAL_PIXEL_FORMAT_YCbCr_422_I,
HAL_PIXEL_FORMAT_UYVY = HAL_PIXEL_FORMAT_CbYCrY_422_I,
HAL_PIXEL_FORMAT_NV12_ADRENO_TILED = HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED,
HAL_PIXEL_FORMAT_NV12 = HAL_PIXEL_FORMAT_YCbCr_420_SP,
HAL_PIXEL_FORMAT_NV61 = HAL_PIXEL_FORMAT_YCrCb_422_SP
};
/** /**
* Transformation definitions * Transformation definitions

6
include/hardware/overlay.h
View File

@@ -45,10 +45,8 @@ enum {
OVERLAY_FORMAT_RGBA_8888 = HAL_PIXEL_FORMAT_RGBA_8888, OVERLAY_FORMAT_RGBA_8888 = HAL_PIXEL_FORMAT_RGBA_8888,
OVERLAY_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565, OVERLAY_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565,
OVERLAY_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888, OVERLAY_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
OVERLAY_FORMAT_YCbCr_422_SP = HAL_PIXEL_FORMAT_YCbCr_422_SP, OVERLAY_FORMAT_YCbYCr_422_I = 0x14,
OVERLAY_FORMAT_YCbCr_420_SP = HAL_PIXEL_FORMAT_YCbCr_420_SP, OVERLAY_FORMAT_CbYCrY_422_I = 0x16,
OVERLAY_FORMAT_YCbYCr_422_I = HAL_PIXEL_FORMAT_YCbCr_422_I,
OVERLAY_FORMAT_CbYCrY_422_I = HAL_PIXEL_FORMAT_CbYCrY_422_I,
OVERLAY_FORMAT_DEFAULT = 99 // The actual color format is determined OVERLAY_FORMAT_DEFAULT = 99 // The actual color format is determined
// by the overlay // by the overlay
}; };