diff options
| author | Romain Guy <romainguy@google.com> | 2016-12-15 01:27:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-15 01:27:28 +0000 |
| commit | ab2e00be4b8228fcde1e92d04232a1df5cae2504 (patch) | |
| tree | 78cd32c28f9d90487fac53f86cf064a496f1f203 /graphics/common/1.0 | |
| parent | 0856368d03f59b2d4765b725971497a55d9b597c (diff) | |
| parent | 175766c8e443a3d4f17a6947813820305a5b4ab2 (diff) | |
| download | platform_hardware_interfaces-ab2e00be4b8228fcde1e92d04232a1df5cae2504.tar.gz platform_hardware_interfaces-ab2e00be4b8228fcde1e92d04232a1df5cae2504.tar.bz2 platform_hardware_interfaces-ab2e00be4b8228fcde1e92d04232a1df5cae2504.zip | |
Merge "Prevent conflict with deprecated pixel format constants"
Diffstat (limited to 'graphics/common/1.0')
| -rw-r--r-- | graphics/common/1.0/types.hal | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/graphics/common/1.0/types.hal b/graphics/common/1.0/types.hal index 9726c3a52d..67ff353219 100644 --- a/graphics/common/1.0/types.hal +++ b/graphics/common/1.0/types.hal @@ -40,11 +40,11 @@ enum PixelFormat : int32_t { /* * The following formats use a 16bit float per color component. */ - RGBA_FP16 = 0x10, - RGBX_FP16 = 0x11, + RGBA_FP16 = 0x16, + RGBX_FP16 = 0x17, /* - * 0x100 - 0x1FF + * 0x101 - 0x1FF * * This range is reserved for pixel formats that are specific to the HAL * implementation. Implementations can use any value in this range to @@ -422,9 +422,10 @@ enum PixelFormat : int32_t { FLEX_RGBA_8888 = 0x2A, /* Legacy formats (deprecated), used by ImageFormat.java */ - YCBCR_422_SP = 0x10, // NV16 - YCRCB_420_SP = 0x11, // NV21 - YCBCR_422_I = 0x14, // YUY2 + YCBCR_422_SP = 0x10, // NV16 + YCRCB_420_SP = 0x11, // NV21 + YCBCR_422_I = 0x14, // YUY2 + JPEG = 0x100, }; /** |