From 175766c8e443a3d4f17a6947813820305a5b4ab2 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 13 Dec 2016 16:20:34 -0800 Subject: Prevent conflict with deprecated pixel format constants Bug: 32984164 Test: Compile Change-Id: I9c3a1cdf0dbd498379453a982ac2a92aabb532b6 --- graphics/common/1.0/types.hal | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'graphics/common/1.0') 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, }; /** -- cgit v1.2.3