diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-16 17:33:37 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-02-16 17:33:37 -0800 |
| commit | 54ed4f6282bdea251455f39b978626026affdbef (patch) | |
| tree | 157d34806bbfab22e433c1eafe0e2bf72f832af2 /include | |
| parent | 39696474d715de575949a9cdf12e7ff339896f8d (diff) | |
| download | frameworks_native-54ed4f6282bdea251455f39b978626026affdbef.zip frameworks_native-54ed4f6282bdea251455f39b978626026affdbef.tar.gz frameworks_native-54ed4f6282bdea251455f39b978626026affdbef.tar.bz2 | |
get rid off the YUV formats at the libui layer
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/PixelFormat.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/include/ui/PixelFormat.h b/include/ui/PixelFormat.h index 6d87321b..607155c 100644 --- a/include/ui/PixelFormat.h +++ b/include/ui/PixelFormat.h @@ -30,6 +30,7 @@ #include <sys/types.h> #include <utils/Errors.h> #include <pixelflinger/format.h> +#include <hardware/hardware.h> namespace android { @@ -57,25 +58,18 @@ enum { // real pixel formats supported for rendering ----------------------------- - PIXEL_FORMAT_RGBA_8888 = GGL_PIXEL_FORMAT_RGBA_8888, // 4x8-bit RGBA - PIXEL_FORMAT_RGBX_8888 = GGL_PIXEL_FORMAT_RGBX_8888, // 4x8-bit RGB0 - PIXEL_FORMAT_RGB_888 = GGL_PIXEL_FORMAT_RGB_888, // 3x8-bit RGB - PIXEL_FORMAT_RGB_565 = GGL_PIXEL_FORMAT_RGB_565, // 16-bit RGB - PIXEL_FORMAT_BGRA_8888 = GGL_PIXEL_FORMAT_BGRA_8888, // 4x8-bit BGRA - PIXEL_FORMAT_RGBA_5551 = GGL_PIXEL_FORMAT_RGBA_5551, // 16-bit ARGB - PIXEL_FORMAT_RGBA_4444 = GGL_PIXEL_FORMAT_RGBA_4444, // 16-bit ARGB + PIXEL_FORMAT_RGBA_8888 = HAL_PIXEL_FORMAT_RGBA_8888, // 4x8-bit RGBA + PIXEL_FORMAT_RGBX_8888 = HAL_PIXEL_FORMAT_RGBX_8888, // 4x8-bit RGB0 + PIXEL_FORMAT_RGB_888 = HAL_PIXEL_FORMAT_RGB_888, // 3x8-bit RGB + PIXEL_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565, // 16-bit RGB + PIXEL_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888, // 4x8-bit BGRA + PIXEL_FORMAT_RGBA_5551 = HAL_PIXEL_FORMAT_RGBA_5551, // 16-bit ARGB + PIXEL_FORMAT_RGBA_4444 = HAL_PIXEL_FORMAT_RGBA_4444, // 16-bit ARGB PIXEL_FORMAT_A_8 = GGL_PIXEL_FORMAT_A_8, // 8-bit A PIXEL_FORMAT_L_8 = GGL_PIXEL_FORMAT_L_8, // 8-bit L (R=G=B=L) PIXEL_FORMAT_LA_88 = GGL_PIXEL_FORMAT_LA_88, // 16-bit LA PIXEL_FORMAT_RGB_332 = GGL_PIXEL_FORMAT_RGB_332, // 8-bit RGB - PIXEL_FORMAT_YCbCr_422_SP= GGL_PIXEL_FORMAT_YCbCr_422_SP, - PIXEL_FORMAT_YCbCr_420_SP= GGL_PIXEL_FORMAT_YCbCr_420_SP, - PIXEL_FORMAT_YCbCr_422_P = GGL_PIXEL_FORMAT_YCbCr_422_P, - PIXEL_FORMAT_YCbCr_420_P = GGL_PIXEL_FORMAT_YCbCr_420_P, - PIXEL_FORMAT_YCbCr_422_I = GGL_PIXEL_FORMAT_YCbCr_422_I, - PIXEL_FORMAT_YCbCr_420_I = GGL_PIXEL_FORMAT_YCbCr_420_I, - // New formats can be added if they're also defined in // pixelflinger/format.h }; @@ -96,10 +90,7 @@ struct PixelFormatInfo RGB = 2, RGBA = 3, LUMINANCE = 4, - LUMINANCE_ALPHA = 5, - Y_CB_CR_SP = 6, - Y_CB_CR_P = 7, - Y_CB_CR_I = 8, + LUMINANCE_ALPHA = 5 }; struct szinfo { |