exynos5: libcsc: add simple helper library for hal<->omx format conversions
Change-Id: Ie687a485ab3538dc8cb60fdc5bf57a5d7be5c297
Signed-off-by: Dima Zavin <dima@android.com>
diff --git a/libcsc/Android.mk b/libcsc/Android.mk
index 01ba70f..86e2c74 100644
--- a/libcsc/Android.mk
+++ b/libcsc/Android.mk
@@ -1,5 +1,27 @@
LOCAL_PATH := $(call my-dir)
+OMX_NAME := exynos
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ csc_helper.c
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/../exynos_omx/openmax/$(OMX_NAME)_omx/include/khronos \
+ $(LOCAL_PATH)/../exynos_omx/openmax/$(OMX_NAME)_omx/include/$(OMX_NAME) \
+ $(LOCAL_PATH)/../include
+
+LOCAL_CFLAGS := \
+ -DUSE_SAMSUNG_COLORFORMAT \
+ -DEXYNOS_OMX
+
+LOCAL_MODULE := libcsc_helper
+LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_LIBRARIES := liblog
+
+include $(BUILD_STATIC_LIBRARY)
+
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
@@ -7,8 +29,6 @@
LOCAL_SRC_FILES := \
csc.c
-OMX_NAME := exynos
-
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../exynos_omx/openmax/$(OMX_NAME)_omx/include/khronos \
$(LOCAL_PATH)/../exynos_omx/openmax/$(OMX_NAME)_omx/include/$(OMX_NAME) \
@@ -23,16 +43,15 @@
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libswconverter
+LOCAL_WHOLE_STATIC_LIBRARIES := libcsc_helper
LOCAL_SHARED_LIBRARIES := liblog libexynosutils
LOCAL_CFLAGS += -DUSE_SAMSUNG_COLORFORMAT
-ifeq ($(TARGET_BOARD_PLATFORM), exynos5)
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include
LOCAL_CFLAGS += -DUSE_GSCALER
LOCAL_SHARED_LIBRARIES += libexynosgscaler
-endif
LOCAL_CFLAGS += -DUSE_ION
LOCAL_SHARED_LIBRARIES += libion_exynos
diff --git a/libcsc/csc.c b/libcsc/csc.c
index c29716b..4097518 100644
--- a/libcsc/csc.c
+++ b/libcsc/csc.c
@@ -95,54 +95,6 @@
void *csc_hw_handle;
} CSC_HANDLE;
-OMX_COLOR_FORMATTYPE hal_2_omx_pixel_format(
- unsigned int hal_format)
-{
- OMX_COLOR_FORMATTYPE omx_format;
- switch (hal_format) {
- case HAL_PIXEL_FORMAT_YCbCr_420_P:
- omx_format = OMX_COLOR_FormatYUV420Planar;
- break;
- case HAL_PIXEL_FORMAT_YCbCr_420_SP:
- omx_format = OMX_COLOR_FormatYUV420SemiPlanar;
- break;
- case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
- omx_format = OMX_SEC_COLOR_FormatNV12Tiled;
- break;
- case HAL_PIXEL_FORMAT_ARGB888:
- omx_format = OMX_COLOR_Format32bitARGB8888;
- break;
- default:
- omx_format = OMX_COLOR_FormatYUV420Planar;
- break;
- }
- return omx_format;
-}
-
-unsigned int omx_2_hal_pixel_format(
- OMX_COLOR_FORMATTYPE omx_format)
-{
- unsigned int hal_format;
- switch (omx_format) {
- case OMX_COLOR_FormatYUV420Planar:
- hal_format = HAL_PIXEL_FORMAT_YCbCr_420_P;
- break;
- case OMX_COLOR_FormatYUV420SemiPlanar:
- hal_format = HAL_PIXEL_FORMAT_YCbCr_420_SP;
- break;
- case OMX_SEC_COLOR_FormatNV12Tiled:
- hal_format = HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED;
- break;
- case OMX_COLOR_Format32bitARGB8888:
- hal_format = HAL_PIXEL_FORMAT_ARGB888;
- break;
- default:
- hal_format = HAL_PIXEL_FORMAT_YCbCr_420_P;
- break;
- }
- return hal_format;
-}
-
/* source is RGB888 */
static CSC_ERRORCODE conv_sw_src_argb888(
CSC_HANDLE *handle)
diff --git a/libcsc/csc_helper.c b/libcsc/csc_helper.c
new file mode 100644
index 0000000..0dcd33d
--- /dev/null
+++ b/libcsc/csc_helper.c
@@ -0,0 +1,72 @@
+/*
+ *
+ * Copyright 2012 Samsung Electronics S.LSI Co. LTD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "libcsc_helper"
+#include <cutils/log.h>
+
+#include "Exynos_OMX_Def.h"
+
+#include "csc.h"
+#include "exynos_format.h"
+
+OMX_COLOR_FORMATTYPE hal_2_omx_pixel_format(
+ unsigned int hal_format)
+{
+ OMX_COLOR_FORMATTYPE omx_format;
+ switch (hal_format) {
+ case HAL_PIXEL_FORMAT_YCbCr_420_P:
+ omx_format = OMX_COLOR_FormatYUV420Planar;
+ break;
+ case HAL_PIXEL_FORMAT_YCbCr_420_SP:
+ omx_format = OMX_COLOR_FormatYUV420SemiPlanar;
+ break;
+ case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:
+ omx_format = OMX_SEC_COLOR_FormatNV12Tiled;
+ break;
+ case HAL_PIXEL_FORMAT_ARGB888:
+ omx_format = OMX_COLOR_Format32bitARGB8888;
+ break;
+ default:
+ omx_format = OMX_COLOR_FormatYUV420Planar;
+ break;
+ }
+ return omx_format;
+}
+
+unsigned int omx_2_hal_pixel_format(
+ OMX_COLOR_FORMATTYPE omx_format)
+{
+ unsigned int hal_format;
+ switch (omx_format) {
+ case OMX_COLOR_FormatYUV420Planar:
+ hal_format = HAL_PIXEL_FORMAT_YCbCr_420_P;
+ break;
+ case OMX_COLOR_FormatYUV420SemiPlanar:
+ hal_format = HAL_PIXEL_FORMAT_YCbCr_420_SP;
+ break;
+ case OMX_SEC_COLOR_FormatNV12Tiled:
+ hal_format = HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED;
+ break;
+ case OMX_COLOR_Format32bitARGB8888:
+ hal_format = HAL_PIXEL_FORMAT_ARGB888;
+ break;
+ default:
+ hal_format = HAL_PIXEL_FORMAT_YCbCr_420_P;
+ break;
+ }
+ return hal_format;
+}