X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=openmax%2Finclude%2Fexynos%2FExynos_OMX_Def.h;h=8c660389c9fa28d5663907537bcd724fbed29313;hb=96df7d66f7383529553660733633b9d3e46cd1ff;hp=c533aa98fa75495ba85de972aae9f3a758c93c40;hpb=d13508130aeb99537fcd12782785db753efd1b7f;p=platform%2Fadaptation%2Fap_samsung%2Flibomxil-e3250-v4l2.git diff --git a/openmax/include/exynos/Exynos_OMX_Def.h b/openmax/include/exynos/Exynos_OMX_Def.h index c533aa9..8c66038 100755 --- a/openmax/include/exynos/Exynos_OMX_Def.h +++ b/openmax/include/exynos/Exynos_OMX_Def.h @@ -31,10 +31,10 @@ #include "OMX_IVCommon.h" #define VERSIONMAJOR_NUMBER 1 -#ifndef SLP_PLATFORM /* omx version */ +#ifndef TIZEN_FEATURE_E3250 /* omx version */ #define VERSIONMINOR_NUMBER 0 #else -#define VERSIONMINOR_NUMBER 1 +#define VERSIONMINOR_NUMBER 1 #endif #define REVISION_NUMBER 0 #define STEP_NUMBER 0 @@ -85,7 +85,7 @@ typedef enum _EXYNOS_OMX_INDEXTYPE OMX_IndexVendorS3DMode = 0x7F000003, #endif -#ifdef SLP_PLATFORM +#ifdef TIZEN_FEATURE_E3250 #define EXYNOS_INDEX_PARAM_ENABLE_PB "OMX.SEC.index.enablePlatformSpecificBuffers" OMX_IndexParamEnablePlatformSpecificBuffers = 0x7F000011, #else @@ -103,7 +103,7 @@ typedef enum _EXYNOS_OMX_INDEXTYPE /* prepend SPS/PPS to I/IDR for H.264 Encoder */ #define EXYNOS_INDEX_PARAM_PREPEND_SPSPPS_TO_IDR "OMX.SEC.index.prependSPSPPSToIDRFrames" OMX_IndexParamPrependSPSPPSToIDR = 0x7F000015, -#ifdef SLP_PLATFORM +#ifdef TIZEN_FEATURE_E3250 /* avi demux timestamp reorder */ #define EXYNOS_INDEX_PARAM_ENABLE_TS_REORDER "OMX.SEC.index.enableTimestampReorder" OMX_IndexParamEnableTimestampReorder = 0x7F000016, @@ -149,7 +149,7 @@ typedef enum _EXYNOS_OMX_TRANS_STATETYPE { } EXYNOS_OMX_TRANS_STATETYPE; typedef enum _EXYNOS_OMX_COLOR_FORMATTYPE { -#ifdef SLP_PLATFORM /* dmabuf fd color format */ +#ifdef TIZEN_FEATURE_E3250 /* dmabuf fd color format */ OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd = 0x7F000001, /* use same value with phyaddr */ OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd = 0x7F000002, #else @@ -219,69 +219,7 @@ typedef enum _EXYNOS_OMX_FPARGMT_TYPE #define EXYNOS_IMPORT_REF __attribute__((visibility("default"))) #endif -#ifdef SLP_PLATFORM -/* for using ST12, set the hw addr at SCMN_IMGB type buffer */ -#define SCMN_IMGB_MAX_PLANE (4) /* max channel count */ - -/* image buffer definition - +------------------------------------------+ --- - | | ^ - | a[], p[] | | - | +---------------------------+ --- | | - | | | ^ | | - | |<---------- w[] ---------->| | | | - | | | | | | - | | | | - | | | h[] | e[] - | | | | - | | | | | | - | | | | | | - | | | v | | - | +---------------------------+ --- | | - | | v - +------------------------------------------+ --- - - |<----------------- s[] ------------------>| -*/ - -typedef struct -{ - int w[SCMN_IMGB_MAX_PLANE]; /* width of each image plane */ - int h[SCMN_IMGB_MAX_PLANE]; /* height of each image plane */ - int s[SCMN_IMGB_MAX_PLANE]; /* stride of each image plane */ - int e[SCMN_IMGB_MAX_PLANE]; /* elevation of each image plane */ - void * a[SCMN_IMGB_MAX_PLANE]; /* user space address of each image plane */ - void * p[SCMN_IMGB_MAX_PLANE]; /* physical address of each image plane, if needs */ - int cs; /* color space type of image */ - int x; /* left postion, if needs */ - int y; /* top position, if needs */ - int __dummy2; /* to align memory */ - int data[16]; /* arbitrary data */ - - /* dmabuf fd */ - int fd[SCMN_IMGB_MAX_PLANE]; - - /* flag for buffer share */ - int buf_share_method; - - /* Y plane size in case of ST12 */ - int y_size; - /* UV plane size in case of ST12 */ - int uv_size; - - /* Tizen buffer object of each image plane */ - void *bo[SCMN_IMGB_MAX_PLANE]; - - /* JPEG data */ - void *jpeg_data; - /* JPEG size */ - int jpeg_size; - - /* tzmem buffer */ - int tz_enable; -} SCMN_IMGB; - - +#ifdef TIZEN_FEATURE_E3250 typedef enum { MEMORY_PADDR = 0, MEMORY_DMABUF,