diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-12-30 21:41:26 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-12-30 21:41:26 +0700 |
| commit | 88520338e7e2d8587e0c6d9bac912a588a037d64 (patch) | |
| tree | 8da081e656ea8f1fafeb23792c189ff060bbd239 /include/sec_format.h | |
| parent | 19f0779b5655234f1a9514651b6890a0069a5450 (diff) | |
| download | device_samsung_aries-common-88520338e7e2d8587e0c6d9bac912a588a037d64.zip device_samsung_aries-common-88520338e7e2d8587e0c6d9bac912a588a037d64.tar.gz device_samsung_aries-common-88520338e7e2d8587e0c6d9bac912a588a037d64.tar.bz2 | |
Fix conflict with generic defines (for now)
Diffstat (limited to 'include/sec_format.h')
| -rwxr-xr-x | include/sec_format.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/include/sec_format.h b/include/sec_format.h index 99a47bf..13604a9 100755 --- a/include/sec_format.h +++ b/include/sec_format.h @@ -20,24 +20,24 @@ /* enum related to pixel format */ enum { - HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x100, - HAL_PIXEL_FORMAT_YCbCr_420_P = 0x101, - HAL_PIXEL_FORMAT_YCbCr_420_I = 0x102, - HAL_PIXEL_FORMAT_CbYCrY_422_I = 0x103, - HAL_PIXEL_FORMAT_CbYCrY_420_I = 0x104, - HAL_PIXEL_FORMAT_YCbCr_422_P = 0x105, - HAL_PIXEL_FORMAT_YCrCb_422_SP = 0x106, + SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x100, + SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_P = 0x101, + SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_I = 0x102, + SAMSUNG_HAL_PIXEL_FORMAT_CbYCrY_422_I = 0x103, + SAMSUNG_HAL_PIXEL_FORMAT_CbYCrY_420_I = 0x104, + SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_422_P = 0x105, + SAMSUNG_HAL_PIXEL_FORMAT_YCrCb_422_SP = 0x106, // support custom format for zero copy - HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP = 0x110, - HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP = 0x111, - HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED = 0x112, - HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP = 0x113, - HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP = 0x114, - HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I = 0x115, - HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I = 0x116, - HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I = 0x117, - HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I = 0x118, - HAL_PIXEL_FORMAT_CUSTOM_MAX + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP = 0x110, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP = 0x111, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED = 0x112, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP = 0x113, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP = 0x114, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I = 0x115, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I = 0x116, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I = 0x117, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I = 0x118, + SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_MAX }; #endif |