From 88520338e7e2d8587e0c6d9bac912a588a037d64 Mon Sep 17 00:00:00 2001 From: Pawit Pornkitprasan Date: Fri, 30 Dec 2011 21:41:26 +0700 Subject: Fix conflict with generic defines (for now) --- include/sec_format.h | 34 ++++++++++---------- include/sec_utils.h | 88 ++++++++++++++++++++++++++-------------------------- 2 files changed, 61 insertions(+), 61 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 diff --git a/include/sec_utils.h b/include/sec_utils.h index 80b4493..2dc4172 100644 --- a/include/sec_utils.h +++ b/include/sec_utils.h @@ -79,53 +79,53 @@ inline int HAL_PIXEL_FORMAT_2_V4L2_PIX(int HAL_PIXEL_FORMAT) break; case HAL_PIXEL_FORMAT_YV12: - case HAL_PIXEL_FORMAT_YCbCr_420_P: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_P: V4L2_PIX = V4L2_PIX_FMT_YUV420; break; case HAL_PIXEL_FORMAT_YCbCr_422_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP: V4L2_PIX = V4L2_PIX_FMT_NV61; break; - case HAL_PIXEL_FORMAT_YCbCr_420_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP: V4L2_PIX = V4L2_PIX_FMT_NV12; break; case HAL_PIXEL_FORMAT_YCbCr_422_I: - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I: V4L2_PIX = V4L2_PIX_FMT_YUYV; break; - case HAL_PIXEL_FORMAT_YCbCr_422_P: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_422_P: V4L2_PIX = V4L2_PIX_FMT_YUV422P; break; - case HAL_PIXEL_FORMAT_CbYCrY_422_I: - case HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CbYCrY_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I: V4L2_PIX = V4L2_PIX_FMT_UYVY; break; - case HAL_PIXEL_FORMAT_YCrCb_422_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_YCrCb_422_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP: V4L2_PIX = V4L2_PIX_FMT_NV16; break; case HAL_PIXEL_FORMAT_YCrCb_420_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP: V4L2_PIX = V4L2_PIX_FMT_NV21; break; - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED: V4L2_PIX = V4L2_PIX_FMT_NV12T; break; - case HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I: V4L2_PIX = V4L2_PIX_FMT_YVYU; break; - case HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I: V4L2_PIX = V4L2_PIX_FMT_VYUY; break; @@ -170,52 +170,52 @@ inline int V4L2_PIX_2_HAL_PIXEL_FORMAT(int V4L2_PIX) case V4L2_PIX_FMT_YUV420: //HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YV12; - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YCbCr_420_P; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_P; break; case V4L2_PIX_FMT_NV16: - //HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YCrCb_422_SP; - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP; + //HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_YCrCb_422_SP; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP; break; case V4L2_PIX_FMT_NV12: //HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YCrCb_420_SP; - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP; break; case V4L2_PIX_FMT_YUYV: //HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YCbCr_422_I; - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I; break; case V4L2_PIX_FMT_YUV422P: - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YCbCr_422_P; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_422_P; break; case V4L2_PIX_FMT_UYVY: - //HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CbYCrY_422_I; - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I; + //HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CbYCrY_422_I; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I; break; case V4L2_PIX_FMT_NV21: - //HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_YCbCr_420_SP; - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP; + //HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_SP; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP; break; case V4L2_PIX_FMT_NV12T: - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED; break; case V4L2_PIX_FMT_NV61: - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP; break; case V4L2_PIX_FMT_YVYU: - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I; break; case V4L2_PIX_FMT_VYUY: - HAL_PIXEL_FORMAT = HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I; + HAL_PIXEL_FORMAT = SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I; break; default: @@ -286,12 +286,12 @@ inline unsigned int FRAME_SIZE(int HAL_PIXEL_FORMAT, int w, int h) // 12bpp case HAL_PIXEL_FORMAT_YV12: case HAL_PIXEL_FORMAT_YCrCb_420_SP: - case HAL_PIXEL_FORMAT_YCbCr_420_P: - case HAL_PIXEL_FORMAT_YCbCr_420_I: - case HAL_PIXEL_FORMAT_CbYCrY_420_I: - case HAL_PIXEL_FORMAT_YCbCr_420_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_P: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CbYCrY_420_I: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_420_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP: size = w * h; // frame_size = width * height * 3 / 2; // sw5771.park : very curious... @@ -299,7 +299,7 @@ inline unsigned int FRAME_SIZE(int HAL_PIXEL_FORMAT, int w, int h) frame_size = size + ((size >> 2) << 1); break; - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED: frame_size = ALIGN_TO_8KB(ALIGN_TO_128B(w) * ALIGN_TO_32B(h)) + ALIGN_TO_8KB(ALIGN_TO_128B(w) * ALIGN_TO_32B(h >> 1)); break; @@ -307,15 +307,15 @@ inline unsigned int FRAME_SIZE(int HAL_PIXEL_FORMAT, int w, int h) // 16bpp case HAL_PIXEL_FORMAT_YCbCr_422_SP: case HAL_PIXEL_FORMAT_YCbCr_422_I: - case HAL_PIXEL_FORMAT_YCbCr_422_P: - case HAL_PIXEL_FORMAT_CbYCrY_422_I: - case HAL_PIXEL_FORMAT_YCrCb_422_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP: - case HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I: - case HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I: - case HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I: - case HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_YCbCr_422_P: + case SAMSUNG_HAL_PIXEL_FORMAT_CbYCrY_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_YCrCb_422_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_SP: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCbCr_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_YCrCb_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CbYCrY_422_I: + case SAMSUNG_HAL_PIXEL_FORMAT_CUSTOM_CrYCbY_422_I: frame_size = GET_16BPP_FRAME_SIZE(w, h); break; -- cgit v1.1