From ae570c5d1b371aca69f7391c9dcdad74ac0202db Mon Sep 17 00:00:00 2001 From: Greg Hackmann Date: Thu, 3 Jan 2013 11:22:37 -0800 Subject: [PATCH] csc: fix custom ARGB_8888 pixel format's name Change-Id: Ie5931a15bcfcfc9c2bdcad416987459d8f85fc2b Signed-off-by: Greg Hackmann --- exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp | 4 ++-- include/exynos_format.h | 2 +- libcsc/csc.c | 2 +- libcsc/csc_helper.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp index 142580c..b4fa5f2 100644 --- a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp +++ b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp @@ -612,7 +612,7 @@ OMX_COLOR_FORMATTYPE Exynos_OSAL_Hal2OMXPixelFormat( case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED: omx_format = (OMX_COLOR_FORMATTYPE)OMX_SEC_COLOR_FormatNV12Tiled; break; - case HAL_PIXEL_FORMAT_ARGB888: + case HAL_PIXEL_FORMAT_CUSTOM_ARGB_8888: omx_format = OMX_COLOR_Format32bitARGB8888; break; default: @@ -643,7 +643,7 @@ unsigned int Exynos_OSAL_OMX2HalPixelFormat( hal_format = HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED; break; case OMX_COLOR_Format32bitARGB8888: - hal_format = HAL_PIXEL_FORMAT_ARGB888; + hal_format = HAL_PIXEL_FORMAT_CUSTOM_ARGB_8888; break; default: hal_format = HAL_PIXEL_FORMAT_YCbCr_420_P; diff --git a/include/exynos_format.h b/include/exynos_format.h index f4c0466..610c89d 100644 --- a/include/exynos_format.h +++ b/include/exynos_format.h @@ -30,7 +30,7 @@ enum { HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x105, HAL_PIXEL_FORMAT_YCrCb_422_SP = 0x106, HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED = 0x107, - HAL_PIXEL_FORMAT_ARGB888 = 0x108, + HAL_PIXEL_FORMAT_CUSTOM_ARGB_8888 = 0x108, // support custom format for zero copy HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP = 0x110, HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP = 0x111, diff --git a/libcsc/csc.c b/libcsc/csc.c index 4f2aac6..409391a 100644 --- a/libcsc/csc.c +++ b/libcsc/csc.c @@ -265,7 +265,7 @@ static CSC_ERRORCODE conv_sw( case HAL_PIXEL_FORMAT_YCbCr_420_SP: ret = conv_sw_src_yuv420sp(handle); break; - case HAL_PIXEL_FORMAT_ARGB888: + case HAL_PIXEL_FORMAT_CUSTOM_ARGB_8888: ret = conv_sw_src_argb888(handle); break; default: diff --git a/libcsc/csc_helper.c b/libcsc/csc_helper.c index 9f13d62..c8f869f 100644 --- a/libcsc/csc_helper.c +++ b/libcsc/csc_helper.c @@ -45,7 +45,7 @@ OMX_COLOR_FORMATTYPE hal_2_omx_pixel_format( case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED: omx_format = OMX_SEC_COLOR_FormatNV12Tiled; break; - case HAL_PIXEL_FORMAT_ARGB888: + case HAL_PIXEL_FORMAT_CUSTOM_ARGB_8888: omx_format = OMX_COLOR_Format32bitARGB8888; break; default: @@ -76,7 +76,7 @@ unsigned int omx_2_hal_pixel_format( hal_format = HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED; break; case OMX_COLOR_Format32bitARGB8888: - hal_format = HAL_PIXEL_FORMAT_ARGB888; + hal_format = HAL_PIXEL_FORMAT_CUSTOM_ARGB_8888; break; default: hal_format = HAL_PIXEL_FORMAT_YCbCr_420_P; -- 2.20.1