for callback invoke when resolution is changed 02/117902/4
authorSejun Park <sejun79.park@samsung.com>
Wed, 8 Mar 2017 04:16:44 +0000 (13:16 +0900)
committerSejun Park <sejun79.park@samsung.com>
Wed, 8 Mar 2017 07:35:05 +0000 (16:35 +0900)
Change-Id: I2733a299a0fed27c2339c974a2c123ed1a2dce5f

49 files changed:
config.guess [changed mode: 0755->0644]
config.sub [changed mode: 0755->0644]
configure.ac [changed mode: 0755->0644]
exynos/include/exynos_v4l2.h [changed mode: 0755->0644]
exynos/libcsc/csc.c [changed mode: 0755->0644]
exynos/libcsc/csc_helper.c
exynos/libv4l2/exynos_mc.c
exynos/libv4l2/exynos_subdev.c [changed mode: 0644->0755]
exynos/libv4l2/exynos_v4l2.c
exynos4/libcodec/audio/alp/dec/srp_api.c
exynos4/libcodec/audio/alp/include/srp_api.h
exynos4/libcodec/audio/alp/include/srp_error.h
exynos4/libcodec/video/v4l2/dec/ExynosVideoDecoder.c
exynos4/libcodec/video/v4l2/enc/ExynosVideoEncoder.c
exynos4/libion_exynos/libion.c [changed mode: 0644->0755]
libomxil-e3250-v4l2.manifest [changed mode: 0755->0644]
openmax/component/audio/dec/Exynos_OMX_Adec.c
openmax/component/audio/dec/mp3/Exynos_OMX_Mp3dec.c [changed mode: 0644->0755]
openmax/component/audio/dec/mp3/Exynos_OMX_Mp3dec.h [changed mode: 0644->0755]
openmax/component/common/Exynos_OMX_Basecomponent.c
openmax/component/common/Exynos_OMX_Baseport.c
openmax/component/common/Exynos_OMX_Resourcemanager.c [changed mode: 0644->0755]
openmax/component/video/dec/Exynos_OMX_Vdec.c [changed mode: 0755->0644]
openmax/component/video/dec/Exynos_OMX_Vdec.h [changed mode: 0755->0644]
openmax/component/video/dec/Exynos_OMX_VdecControl.c [changed mode: 0755->0644]
openmax/component/video/dec/Exynos_OMX_VdecControl.h
openmax/component/video/dec/Makefile.am [changed mode: 0755->0644]
openmax/component/video/dec/h264/Exynos_OMX_H264dec.c
openmax/component/video/dec/h264/Makefile.am
openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c
openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c
openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c [changed mode: 0644->0755]
openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h
openmax/component/video/dec/vc1/Makefile.am
openmax/component/video/enc/Exynos_OMX_Venc.c
openmax/component/video/enc/Exynos_OMX_Venc.h [changed mode: 0644->0755]
openmax/component/video/enc/Exynos_OMX_VencControl.c
openmax/component/video/enc/h264/Exynos_OMX_H264enc.c [changed mode: 0644->0755]
openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
openmax/core/Exynos_OMX_Core.h [changed mode: 0644->0755]
openmax/include/exynos/Exynos_OMX_Def.h
openmax/osal/Exynos_OSAL_Log.c [changed mode: 0644->0755]
openmax/osal/Exynos_OSAL_Log.h [changed mode: 0644->0755]
openmax/osal/Exynos_OSAL_Memory.c [changed mode: 0644->0755]
openmax/osal/Exynos_OSAL_Platform_Specific.c
openmax/osal/Exynos_OSAL_Platform_Specific.h
openmax/osal/Exynos_OSAL_SharedMemory.c [changed mode: 0644->0755]
packaging/libomxil-e3250-v4l2.spec
srp.pc.in [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index cc2ad52..94fe613
@@ -76,7 +76,7 @@ AC_FUNC_MMAP
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS([gettimeofday memmove memset munmap])
 
-AC_DEFINE([SLP_PLATFORM])
+AC_DEFINE([TIZEN_FEATURE_E3250])
 AC_DEFINE([USE_IMMEDIATE_DISPLAY])
 
 dnl use dlog ------------------------------------------------------------------
old mode 100755 (executable)
new mode 100644 (file)
index 7df8cc9..036e832
@@ -41,7 +41,7 @@ extern "C" {
 
 /* V4L2 */
 #include <stdbool.h>
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 #include <linux/videodev2.h>
 #include <linux/videodev2_exynos_media.h>
 #else
@@ -73,7 +73,7 @@ int exynos_v4l2_try_fmt(int fd, struct v4l2_format *fmt);
 int exynos_v4l2_reqbufs(int fd, struct v4l2_requestbuffers *req);
 /*! \ingroup exynos_v4l2 */
 int exynos_v4l2_querybuf(int fd, struct v4l2_buffer *buf);
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 int exynos_v4l2_expbuf(int fd, int *buf_fd, __u32 mem_offset);
 #endif
 /*! \ingroup exynos_v4l2 */
@@ -104,7 +104,7 @@ int exynos_v4l2_g_ext_ctrl(int fd, struct v4l2_ext_controls *ctrl);
 int exynos_v4l2_s_ext_ctrl(int fd, struct v4l2_ext_controls *ctrl);
 
 /* V4L2_SUBDEV */
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <v4l2-subdev.h>
 #else
 #include <linux/v4l2-subdev.h>
@@ -134,7 +134,7 @@ int exynos_subdev_s_frame_interval(int fd, struct v4l2_subdev_frame_interval *fr
 int exynos_subdev_enum_mbus_code(int fd, struct v4l2_subdev_mbus_code_enum *mbus_code_enum);
 
 /* MEDIA CONTORLLER */
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <media.h>
 #else
 #include <linux/media.h>
old mode 100755 (executable)
new mode 100644 (file)
index 7fe7afe..df7a09d
  *   2012.1.11 : Create
  */
 #define LOG_TAG "libcsc"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <cutils/log.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
 #include <system/graphics.h>
 #else
@@ -46,7 +46,7 @@
 #include "exynos_format.h"
 #include "swconverter.h"
 
-#ifdef SLP_PLATFORM /* build env */
+#ifdef TIZEN_FEATURE_E3250 /* build env */
 #define EXYNOS_OMX
 #endif
 
index 2a59c47..c333fa4 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #define LOG_TAG "libcsc_helper"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <cutils/log.h>
 #include <system/graphics.h>
 #endif
@@ -31,7 +31,7 @@ OMX_COLOR_FORMATTYPE hal_2_omx_pixel_format(
 {
     OMX_COLOR_FORMATTYPE omx_format;
     switch (hal_format) {
-#ifndef SLP_PLATFORM /* build env */ /* useless */
+#ifndef TIZEN_FEATURE_E3250 /* build env */ /* useless */
     case HAL_PIXEL_FORMAT_YCbCr_422_I:
         omx_format = OMX_COLOR_FormatYCbYCr;
         break;
@@ -65,7 +65,7 @@ unsigned int omx_2_hal_pixel_format(
 {
     unsigned int hal_format;
     switch (omx_format) {
-#ifndef SLP_PLATFORM /* build env */ /* useless */
+#ifndef TIZEN_FEATURE_E3250 /* build env */ /* useless */
     case OMX_COLOR_FormatYCbYCr:
         hal_format = HAL_PIXEL_FORMAT_YCbCr_422_I;
         break;
index 4025b24..66ec719 100755 (executable)
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <media.h>
 #else
 #include <linux/media.h>
@@ -49,7 +49,7 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "libexynosv4l2-mc"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
 #else
 #include "Exynos_OSAL_Log.h"
old mode 100644 (file)
new mode 100755 (executable)
index 5ac578d..6c1b099
@@ -38,9 +38,9 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "libexynosv4l2-subdev"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
-#else 
+#else
 #include "Exynos_OSAL_Log.h"
 #endif
 
index 08b4f82..e050fba 100755 (executable)
@@ -40,9 +40,9 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "libexynosv4l2"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
-#else 
+#else
 #include "Exynos_OSAL_Log.h"
 #endif
 
@@ -428,7 +428,7 @@ int exynos_v4l2_querybuf(int fd, struct v4l2_buffer *buf)
     return ret;
 }
 
-#ifdef SLP_PLATFORM /*dmabuf */
+#ifdef TIZEN_FEATURE_E3250 /*dmabuf */
 
 #ifndef VIDIOC_EXPBUF
 struct v4l2_exportbuffer {
index ab53022..0797b8a 100644 (file)
@@ -41,7 +41,7 @@
 #define LOG_NDEBUG 1
 #define LOG_TAG "libsrpapi"
 
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
 #else
 #include "Exynos_OSAL_Log.h"
@@ -113,8 +113,8 @@ int SRP_Decode(void *buff, int size_byte)
 
             ret = write(srp_dev, buff, size_byte);  /* Write Buffer to RP Driver */
             if (ret < 0) {
-#ifdef SLP_PLATFORM
-/* in slp, ret value is different from android. this is caused from glib. android uses bionic libc. */
+#ifdef TIZEN_FEATURE_E3250
+/* ret value is different from android. this is caused from glib. android uses bionic libc. */
                 ret = -(errno);
 #endif
                 if (ret != SRP_ERROR_IBUF_OVERFLOW)
index 0dcddae..3922135 100644 (file)
@@ -30,7 +30,7 @@
 #include "srp_ioctl.h"
 #include "srp_error.h"
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
 #define SRP_DEV_NAME                    "dev/srp"
 #else
 #define SRP_DEV_NAME                    "/dev/srp"
index 0251ce8..dce8e14 100644 (file)
@@ -36,7 +36,7 @@ typedef enum {
 
     SRP_ERROR_IBUF_OVERFLOW   = -2000,
     SRP_ERROR_IBUF_INFO       = -2001,
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     SRP_ERROR_IBUF_BUFFERING  = -2002,
 #endif
 
index 9d1e48c..31217df 100755 (executable)
@@ -44,7 +44,7 @@
 
 /* #define LOG_NDEBUG 0 */
 #define LOG_TAG "ExynosVideoDecoder"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
 #else
 #include "Exynos_OSAL_Log.h"
@@ -1067,7 +1067,7 @@ static ExynosVideoErrorType MFC_Decoder_Setup_Outbuf(
                 pVideoPlane->allocSize = buf.m.planes[j].length;
                 pVideoPlane->dataSize = 0;
 
-#ifdef SLP_PLATFORM /* dmabuf */
+#ifdef TIZEN_FEATURE_E3250 /* dmabuf */
 #if 0
                 if (pCtx->bufShareMethod == BUF_SHARE_FD) {
                     exynos_v4l2_expbuf(pCtx->hDec, &pVideoPlane->fd, buf.m.planes[j].m.mem_offset);
index 8a12320..a3b1a74 100755 (executable)
 #include "ExynosVideoApi.h"
 #include "ExynosVideoEnc.h"
 
-//#include <mm_ta/mm_ta.h>
-
 /* #define LOG_NDEBUG 0 */
 #define LOG_TAG "ExynosVideoEncoder"
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
-#else 
+#else
 #include "Exynos_OSAL_Log.h"
 #endif
 
@@ -1882,7 +1880,7 @@ static ExynosVideoErrorType MFC_Encoder_Enqueue_Inbuf(
             buf.m.planes[i].m.userptr = (unsigned long)pBuffer[i];
             buf.m.planes[i].length = pCtx->pInbuf[index].planes[i].allocSize;
             /* V4L2_MEMORY_DMABUF */
-#ifdef SLP_PLATFORM /* #ifdef USE_DMA_BUF */
+#ifdef TIZEN_FEATURE_E3250 /* #ifdef USE_DMA_BUF */
             buf.m.planes[i].m.fd = pCtx->pInbuf[buf.index].planes[i].fd;
             buf.m.planes[i].length = 0; /* kernel give the length */
 #endif
old mode 100644 (file)
new mode 100755 (executable)
index 799593d..1702078
@@ -18,7 +18,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <cutils/log.h>
 #endif
 
old mode 100755 (executable)
new mode 100644 (file)
index 4708b49..734d16a 100755 (executable)
@@ -462,7 +462,7 @@ OMX_ERRORTYPE Exynos_InputBufferGetQueue(EXYNOS_OMX_BASECOMPONENT *pExynosCompon
 
             Exynos_OSAL_Free(message);
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
             if (dataBuffer->allocSize <= dataBuffer->dataLen)
                 Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "Input Buffer Full, Check input buffer size! allocSize:%d, dataLen:%d", dataBuffer->allocSize, dataBuffer->dataLen);
 #endif
@@ -874,7 +874,7 @@ OMX_ERRORTYPE Exynos_OMX_FlushPort(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 por
     OMX_S32                   semValue = 0;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "flushPort idx:%d", portIndex);
 #endif
 
@@ -942,7 +942,7 @@ OMX_ERRORTYPE Exynos_OMX_BufferFlush(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 n
     OMX_U32                        i = 0, cnt = 0;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "bufferFlush idx:%d", nPortIndex);
 #endif
 
old mode 100644 (file)
new mode 100755 (executable)
index b31b748..56cc7d5
@@ -448,7 +448,7 @@ OMX_ERRORTYPE Exynos_SRP_Mp3Dec_Init(OMX_COMPONENTTYPE *pOMXComponent)
     pExynosComponent->bSaveFlagEOS = OMX_FALSE;
     pMp3Dec->hSRPMp3Handle.bConfiguredSRP = OMX_FALSE;
     pMp3Dec->hSRPMp3Handle.bSRPSendEOS = OMX_FALSE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pMp3Dec->nPendingflags = 0;
 #endif
     pExynosComponent->getAllDelayBuffer = OMX_FALSE;
@@ -505,7 +505,7 @@ OMX_ERRORTYPE Exynos_SRP_Mp3_Decode_Block(OMX_COMPONENTTYPE *pOMXComponent, EXYN
 #endif
 
     /* Save timestamp and flags of input data */
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     pOutputData->timeStamp = pInputData->timeStamp;
 #else
     if (pExynosComponent->checkTimeStamp.startTimeStamp == pInputData->timeStamp) {
@@ -602,7 +602,7 @@ OMX_ERRORTYPE Exynos_SRP_Mp3_Decode_Block(OMX_COMPONENTTYPE *pOMXComponent, EXYN
     if (dataLen > 0) {
         pOutputData->dataLen = dataLen;
         Exynos_OSAL_Memcpy(pOutputData->buffer.singlePlaneBuffer.dataBuffer, dataBuffer, dataLen);
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
         pOutputData->timeStamp = pMp3Dec->timeStamp;
         pMp3Dec->timeStamp += 1000000 * (OMX_TICKS)dataLen / (pMp3Dec->pcmParam.nSamplingRate * pMp3Dec->pcmParam.nChannels * pMp3Dec->pcmParam.nBitPerSample / 8);
         pOutputData->nFlags |= pMp3Dec->nPendingflags;
@@ -610,7 +610,7 @@ OMX_ERRORTYPE Exynos_SRP_Mp3_Decode_Block(OMX_COMPONENTTYPE *pOMXComponent, EXYN
 #endif
     } else {
         pOutputData->dataLen = 0;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
         pMp3Dec->nPendingflags = pOutputData->nFlags;
 #endif
     }
@@ -629,7 +629,7 @@ OMX_ERRORTYPE Exynos_SRP_Mp3_Decode_Block(OMX_COMPONENTTYPE *pOMXComponent, EXYN
             if (isSRPStopped == 1) {
                 pOutputData->nFlags |= OMX_BUFFERFLAG_EOS;
                 pExynosComponent->getAllDelayBuffer = OMX_FALSE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
                 pOutputData->timeStamp = pInputData->timeStamp; /*For ALP EOS Timestamp*/
 #endif
                 pMp3Dec->hSRPMp3Handle.bSRPSendEOS = OMX_FALSE; /* for repeating one song */
old mode 100644 (file)
new mode 100755 (executable)
index 95e5d3a..8f91066
@@ -48,7 +48,7 @@ typedef struct _EXYNOS_MP3_HANDLE
     /* SEC SRP Codec specific */
     EXYNOS_SRP_MP3_HANDLE      hSRPMp3Handle;
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     OMX_TICKS                   timeStamp;
     OMX_U32                     nPendingflags;
 #endif
index 64390c4..b440efe 100755 (executable)
@@ -201,7 +201,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentStateSet(OMX_COMPONENTTYPE *pOMXComponent, OMX
         Exynos_OMX_Release_Resource(pOMXComponent);
     }
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "destState: %d", destState);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "destState: %d", destState);
index c0f0af8..552fa4d 100755 (executable)
@@ -123,7 +123,7 @@ OMX_ERRORTYPE Exynos_OMX_BufferFlushProcess(OMX_COMPONENTTYPE *pOMXComponent, OM
 
     cnt = (nPortIndex == ALL_PORT_INDEX ) ? ALL_PORT_NUM : 1;
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "bufferFlushProcess cnt:%d port:%d", cnt, nPortIndex);
 #endif
 
@@ -158,7 +158,7 @@ OMX_ERRORTYPE Exynos_OMX_EnablePort(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 po
     OMX_U32                i = 0, cnt = 0;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "enablePort idx:%d", portIndex);
 #endif
 
@@ -205,7 +205,7 @@ OMX_ERRORTYPE Exynos_OMX_PortEnableProcess(OMX_COMPONENTTYPE *pOMXComponent, OMX
 
     cnt = (nPortIndex == ALL_PORT_INDEX) ? ALL_PORT_NUM : 1;
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "portEnableProcess cnt:%d port:%d", cnt, nPortIndex);
 #endif
 
@@ -246,7 +246,7 @@ OMX_ERRORTYPE Exynos_OMX_DisablePort(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 p
     EXYNOS_OMX_MESSAGE       *message;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "disablePort idx:%d", portIndex);
 #endif
 
@@ -304,7 +304,7 @@ OMX_ERRORTYPE Exynos_OMX_PortDisableProcess(OMX_COMPONENTTYPE *pOMXComponent, OM
 
     cnt = (nPortIndex == ALL_PORT_INDEX ) ? ALL_PORT_NUM : 1;
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "portDisableProcess cnt:%d port:%d", cnt, nPortIndex);
 #endif
 
old mode 100644 (file)
new mode 100755 (executable)
index 6383566..7c3aa37
@@ -38,9 +38,9 @@
 #define EXYNOS_LOG_OFF
 #include "Exynos_OSAL_Log.h"
 
-#ifdef SLP_PLATFORM
-#define MAX_RESOURCE_VIDEO_DEC 8 /* for SLP */
-#define MAX_RESOURCE_VIDEO_ENC 2 /* for SLP */
+#ifdef TIZEN_FEATURE_E3250
+#define MAX_RESOURCE_VIDEO_DEC 8 /* for TIZEN */
+#define MAX_RESOURCE_VIDEO_ENC 2 /* for TIZEN */
 #else
 #define MAX_RESOURCE_VIDEO_DEC 3 /* for Android */
 #define MAX_RESOURCE_VIDEO_ENC 1 /* for Android */
old mode 100755 (executable)
new mode 100644 (file)
index fc99f84..877c0e6
@@ -110,7 +110,7 @@ inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
             if (width && height)
                 exynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2;
             break;
-#ifdef SLP_PLATFORM /* nv12t fd */
+#ifdef TIZEN_FEATURE_E3250 /* nv12t fd */
         case OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd:
             if (width && height)
                 exynosOutputPort->portDefinition.nBufferSize = sizeof(MMVideoBuffer);
@@ -138,7 +138,7 @@ inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
 OMX_BOOL Exynos_Check_BufferProcess_State(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_U32 nPortIndex)
 {
     OMX_BOOL ret = OMX_FALSE;
-#ifdef SLP_PLATFORM /* check state */
+#ifdef TIZEN_FEATURE_E3250 /* check state */
     if (pExynosComponent->currentState != OMX_StateExecuting)
         Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "not OMX_StateExecuting");
 
@@ -251,7 +251,7 @@ OMX_BOOL Exynos_CSC_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
     EXYNOS_OMX_DATABUFFER         *outputUseBuffer  = &exynosOutputPort->way.port2WayDataBuffer.outputDataBuffer;
     OMX_U32                        copySize         = 0;
     DECODE_CODEC_EXTRA_BUFFERINFO *pBufferInfo      = NULL;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     MMVideoBuffer *pSlpOutBuf = NULL;
 #endif
 
@@ -276,7 +276,7 @@ OMX_BOOL Exynos_CSC_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
     imageSize = width * height;
     colorFormat = pBufferInfo->ColorFormat;
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pSlpOutBuf = (MMVideoBuffer *)pOutputBuf;
     pSlpOutBuf->width[0] = width;
     pSlpOutBuf->width[1] = width;
@@ -405,7 +405,7 @@ OMX_BOOL Exynos_CSC_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
 
 #ifdef USE_PB
     if (exynosOutputPort->bIsPBEnabled == OMX_TRUE) {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
         Exynos_OSAL_UnlockPB(pOutputBuf, dstOutputData, exynosOutputPort, exynosInputPort);
 #else
         Exynos_OSAL_UnlockPB(pOutputBuf, dstOutputData);
@@ -444,7 +444,7 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
         if (exynosInputPort->bufferProcessType & BUFFER_SHARE) {
             Exynos_Shared_BufferToData(inputUseBuffer, srcInputData, ONE_PLANE);
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
             if (pVideoDec->bDRMPlayerMode == OMX_TRUE) {
                 OMX_PTR dataBuffer = NULL;
 
@@ -541,7 +541,7 @@ OMX_BOOL Exynos_Postprocess_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                 outputUseBuffer->dataValid = OMX_TRUE;
         } else {
 #ifdef USE_PB
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             if (Exynos_Shared_DataToPlatformBuffer(dstOutputData, outputUseBuffer, exynosOutputPort,exynosInputPort) == OMX_ErrorNone) {
 #else
             if (Exynos_Shared_DataToPlatformBuffer(dstOutputData, outputUseBuffer, exynosOutputPort) == OMX_ErrorNone) {
@@ -631,7 +631,7 @@ OMX_BOOL Exynos_Postprocess_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                 outputUseBuffer->timeStamp = dstOutputData->timeStamp;
                 Exynos_OutputBufferReturn(pOMXComponent);
             } else {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
                 Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "output buffer is SCMN_IMGB type.");
                 copySize = outputUseBuffer->allocSize - outputUseBuffer->dataLen;
 
@@ -714,7 +714,7 @@ OMX_ERRORTYPE Exynos_OMX_SrcInputBufferProcess(OMX_HANDLETYPE hComponent)
                         ret = Exynos_InputBufferGetQueue(pExynosComponent);
 
                         inputUseBuffer = &(exynosInputPort->way.port2WayDataBuffer.inputDataBuffer);
-                        pVideoDec->exynos_process_codecConfigData(pOMXComponent, inputUseBuffer); /* SLP_PLATFORM */
+                        pVideoDec->exynos_process_codecConfigData(pOMXComponent, inputUseBuffer); /* TIZEN_FEATURE_E3250 */
 //                        pVideoDec->exynos_process_codecConfigData(pOMXComponent, pSrcInputData);
 
                         bCodecConfigured = OMX_TRUE;
old mode 100755 (executable)
new mode 100644 (file)
index 851c5b9..78843ea
@@ -56,7 +56,7 @@
 #define INPUT_PORT_SUPPORTFORMAT_NUM_MAX    1
 #define OUTPUT_PORT_SUPPORTFORMAT_NUM_MAX   4
 
-#ifdef SLP_PLATFORM /* exrta dpb number */
+#ifdef TIZEN_FEATURE_E3250 /* exrta dpb number */
 #define EXTRA_DPB_NUM                       5
 #else
 #define EXTRA_DPB_NUM                       5
@@ -127,7 +127,7 @@ typedef struct _EXYNOS_OMX_VIDEODEC_COMPONENT
     OMX_PTR csc_handle;
     OMX_U32 csc_set_format;
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     OMX_BOOL bNeedTimestampReorder;
 #endif
 
old mode 100755 (executable)
new mode 100644 (file)
index 2cbb0bc..b6db0e5
@@ -121,7 +121,7 @@ OMX_ERRORTYPE Exynos_OMX_UseBuffer(
                 temp_bufferHeader->nInputPortIndex = INPUT_PORT_INDEX;
             else
                 temp_bufferHeader->nOutputPortIndex = OUTPUT_PORT_INDEX;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             if (nPortIndex == OUTPUT_PORT_INDEX) {
                 MMVideoBuffer * pSlpOutBuf = (MMVideoBuffer *)pBuffer;
 
@@ -469,7 +469,7 @@ OMX_ERRORTYPE Exynos_OMX_FlushPort(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 por
     OMX_S32                semValue = 0;
     int i = 0, maxBufferNum = 0;
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "flushPort idx:%d", portIndex);
 #endif
 
@@ -564,7 +564,7 @@ OMX_ERRORTYPE Exynos_OMX_BufferFlush(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 n
     OMX_U32                   i = 0, cnt = 0;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "bufferFlush idx:%d", nPortIndex);
 #endif
 
@@ -791,7 +791,7 @@ OMX_ERRORTYPE Exynos_InputBufferGetQueue(EXYNOS_OMX_BASECOMPONENT *pExynosCompon
 
             Exynos_OSAL_Free(message);
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
             if (inputUseBuffer->allocSize <= inputUseBuffer->dataLen)
                 Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "Input Buffer Full, Check input buffer size! allocSize:%d, dataLen:%d", inputUseBuffer->allocSize, inputUseBuffer->dataLen);
 #endif
@@ -818,7 +818,7 @@ OMX_ERRORTYPE Exynos_OutputBufferReturn(OMX_COMPONENTTYPE *pOMXComponent)
     bufferHeader = dataBuffer->bufferHeader;
 
     if (bufferHeader != NULL) {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
         bufferHeader->nFilledLen = sizeof(MMVideoBuffer);
 #else
         bufferHeader->nFilledLen = dataBuffer->remainDataLen;
@@ -1018,7 +1018,7 @@ OMX_ERRORTYPE Exynos_CodecBufferEnQueue(EXYNOS_OMX_BASECOMPONENT *pExynosCompone
         goto EXIT;
     }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     if (pExynosPort == NULL) {
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "%s : %d: pExynosPort is NULL", __FUNCTION__, __LINE__);
     }
@@ -1200,7 +1200,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoDecodeGetParameter(
                 portFormat->eColorFormat       = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
                 portFormat->xFramerate         = portDefinition->format.video.xFramerate;
                 break;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             case supportFormat_3:
                 portFormat->eCompressionFormat = OMX_VIDEO_CodingUnused;
                 portFormat->eColorFormat       = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd;
@@ -1304,7 +1304,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoDecodeSetParameter(
     }
         break;
 #ifdef USE_PB
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     case OMX_IndexParamEnablePlatformSpecificBuffers:
 #else
     case OMX_IndexParamEnableAndroidBuffers:
@@ -1316,7 +1316,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoDecodeSetParameter(
         break;
 #endif
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     case OMX_IndexParamEnableTimestampReorder:
     {
         EXYNOS_OMX_VIDEODEC_COMPONENT *pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle;
@@ -1474,7 +1474,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoDecodeGetExtensionIndex(
     }
 
 #ifdef USE_PB
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     if (Exynos_OSAL_Strcmp(cParameterName, EXYNOS_INDEX_PARAM_ENABLE_PB) == 0)
         *pIndexType = (OMX_INDEXTYPE) OMX_IndexParamEnablePlatformSpecificBuffers;
     else if (Exynos_OSAL_Strcmp(cParameterName, EXYNOS_INDEX_PARAM_ENABLE_TS_REORDER) == 0)
@@ -1559,7 +1559,7 @@ EXIT:
 }
 
 /* this is for Fill This Buffer Done */
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 OMX_ERRORTYPE Exynos_Shared_DataToPlatformBuffer(EXYNOS_OMX_DATA *pData, EXYNOS_OMX_DATABUFFER *pUseBuffer, EXYNOS_OMX_BASEPORT *pExynosPort, EXYNOS_OMX_BASEPORT *pExynosInPort)
 #else
 OMX_ERRORTYPE Exynos_Shared_DataToPlatformBuffer(EXYNOS_OMX_DATA *pData, EXYNOS_OMX_DATABUFFER *pUseBuffer, EXYNOS_OMX_BASEPORT *pExynosPort)
@@ -1571,7 +1571,7 @@ OMX_ERRORTYPE Exynos_Shared_DataToPlatformBuffer(EXYNOS_OMX_DATA *pData, EXYNOS_
 
     pUseBuffer->bufferHeader          = pData->bufferHeader;
     pUseBuffer->allocSize             = pData->allocSize;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pUseBuffer->dataLen               = sizeof(MMVideoBuffer);
 #else
     pUseBuffer->dataLen               = pData->dataLen;
@@ -1590,7 +1590,7 @@ OMX_ERRORTYPE Exynos_Shared_DataToPlatformBuffer(EXYNOS_OMX_DATA *pData, EXYNOS_
     }
 
     if (pExynosPort->bIsPBEnabled == OMX_TRUE) {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
         Exynos_OSAL_UnlockPB(pUseBuffer->bufferHeader->pBuffer, pData, pExynosPort,pExynosInPort);
 #else
         Exynos_OSAL_UnlockPB(pUseBuffer->bufferHeader->pBuffer, pData);
index d7428a5..ca12a6b 100644 (file)
@@ -95,7 +95,7 @@ OMX_ERRORTYPE Exynos_FlushOutputBufferReturn(OMX_COMPONENTTYPE *pOMXComponent, E
 
 #ifdef USE_PB
 OMX_ERRORTYPE Exynos_Shared_PlatformBufferToData(EXYNOS_OMX_DATABUFFER *pUseBuffer, EXYNOS_OMX_DATA *pData, EXYNOS_OMX_BASEPORT *pExynosPort, EXYNOS_OMX_PLANE nPlane);
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 OMX_ERRORTYPE Exynos_Shared_DataToPlatformBuffer(EXYNOS_OMX_DATA *pData, EXYNOS_OMX_DATABUFFER *pUseBuffer, EXYNOS_OMX_BASEPORT *pExynosPort,EXYNOS_OMX_BASEPORT *pExynosInPort);
 #else
 OMX_ERRORTYPE Exynos_Shared_DataToPlatformBuffer(EXYNOS_OMX_DATA *pData, EXYNOS_OMX_DATABUFFER *pUseBuffer, EXYNOS_OMX_BASEPORT *pExynosPort);
old mode 100755 (executable)
new mode 100644 (file)
index e3992bb..6a30ffa 100755 (executable)
@@ -518,7 +518,7 @@ OMX_ERRORTYPE H264CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
 
 
     if (pVideoDec->bThumbnailMode == OMX_TRUE)
-        pDecOps->Set_DisplayDelay(hMFCHandle, 0); 
+        pDecOps->Set_DisplayDelay(hMFCHandle, 0);
 
     /* input buffer info */
     Exynos_OSAL_Memset(&bufferConf, 0, sizeof(bufferConf));
@@ -535,7 +535,7 @@ OMX_ERRORTYPE H264CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
     } else if (pExynosInputPort->bufferProcessType & BUFFER_COPY) {
         bufferConf.nSizeImage = DEFAULT_MFC_INPUT_BUFFER_SIZE;
         inputBufferNumber = MFC_INPUT_BUFFER_NUM_MAX;
-    }   
+    }
 
     /* should be done before prepare input buffer */
     if (pInbufOps->Enable_Cacheable(hMFCHandle) != VIDEO_ERROR_NONE) {
@@ -548,7 +548,7 @@ OMX_ERRORTYPE H264CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Failed to set geometry for input buffer");
         ret = OMX_ErrorInsufficientResources;
         goto EXIT;
-    }   
+    }
 
     /* setup input buffer */
     if (pInbufOps->Setup(hMFCHandle, inputBufferNumber) != VIDEO_ERROR_NONE) {
@@ -597,7 +597,7 @@ OMX_ERRORTYPE H264CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
                 Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "@pVideoDec->pMFCDecInputBuffer[%d]->pVirAddr[%d]: 0x%x", i, plane, pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane]);
             }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             if (pExynosInputPort == NULL || pExynosOutputPort == NULL || pOMXComponent == NULL) {
                 Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "invalid param: pExynosInputPort= %p pExynosOutputPort= %p pOMXComponent= %p", pExynosInputPort, pExynosOutputPort, pOMXComponent);
             }
@@ -609,7 +609,7 @@ OMX_ERRORTYPE H264CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
         for (i = 0; i < pExynosInputPort->portDefinition.nBufferCountActual; i++) {
             ExynosVideoPlane plane;
             if (pVideoDec->bDRMPlayerMode == OMX_TRUE) {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
                 /* IL Client assigns FD value in pBuffer */
                 plane.addr = pExynosInputPort->extendBufferHeader[i].OMXBufferHeader->pBuffer;
 #else
@@ -1062,8 +1062,8 @@ OMX_ERRORTYPE H264CodecSrcSetup(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DAT
     ret = OMX_ErrorInputDataDecodeYet;
 
 #ifdef USE_IMMEDIATE_DISPLAY
-    /* Set Immediately display for I Frame*/   
-   pDecOps->Set_ImmediateDisplay(hMFCHandle); 
+    /* Set Immediately display for I Frame*/
+   pDecOps->Set_ImmediateDisplay(hMFCHandle);
 #endif
 
 EXIT:
@@ -1270,8 +1270,10 @@ OMX_ERRORTYPE H264CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent)
              OMX_DirOutput, /* This is the port index */
                  0,
              NULL);
-    }
+        }
     } else if (pExynosOutputPort->bufferProcessType & BUFFER_SHARE) {
+#ifndef TIZEN_FEATURE_E3250
+        /* The input port information has already been updated */
         if ((pExynosInputPort->portDefinition.format.video.nFrameWidth != pH264Dec->hMFCH264Handle.codecOutbufConf.nFrameWidth) ||
             (pExynosInputPort->portDefinition.format.video.nFrameHeight != pH264Dec->hMFCH264Handle.codecOutbufConf.nFrameHeight) ||
             (pExynosOutputPort->portDefinition.nBufferCountActual != pH264Dec->hMFCH264Handle.maxDPBNum)) {
@@ -1279,11 +1281,11 @@ OMX_ERRORTYPE H264CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent)
             pExynosInputPort->portDefinition.format.video.nFrameHeight = pH264Dec->hMFCH264Handle.codecOutbufConf.nFrameHeight;
             pExynosInputPort->portDefinition.format.video.nStride = ((pH264Dec->hMFCH264Handle.codecOutbufConf.nFrameWidth + 15) & (~15));
             pExynosInputPort->portDefinition.format.video.nSliceHeight = ((pH264Dec->hMFCH264Handle.codecOutbufConf.nFrameHeight + 15) & (~15));
-
+#endif
             if (pVideoDec->bDRCProcessing == OMX_TRUE) {
                 pVideoDec->nDRCSavedBufferCount = pExynosOutputPort->portDefinition.nBufferCountActual;
             }
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             pExynosOutputPort->portDefinition.nBufferCountActual = pH264Dec->hMFCH264Handle.maxDPBNum;
             pExynosOutputPort->portDefinition.nBufferCountMin = pH264Dec->hMFCH264Handle.maxDPBNum;
 #else
@@ -1301,7 +1303,9 @@ OMX_ERRORTYPE H264CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent)
                  OMX_DirOutput, /* This is the port index */
                  0,
                  NULL);
+#ifndef TIZEN_FEATURE_E3250
         }
+#endif
     }
 
     if (((pVideoDec->bDRCProcessing) && (pExynosOutputPort->bufferProcessType & BUFFER_COPY)) ||
@@ -1617,7 +1621,7 @@ OMX_ERRORTYPE Exynos_H264Dec_SetParameter(
             case OMX_COLOR_FormatYUV420SemiPlanar:
                 pExynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2;
                 break;
-#ifdef SLP_PLATFORM /* NV12 fd */
+#ifdef TIZEN_FEATURE_E3250 /* NV12 fd */
             case OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd:
             case OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd:
                 pExynosOutputPort->portDefinition.nBufferSize = sizeof(MMVideoBuffer);
@@ -1979,7 +1983,7 @@ OMX_ERRORTYPE Exynos_H264Dec_Init(OMX_COMPONENTTYPE *pOMXComponent)
                 Exynos_CodecBufferEnQueue(pExynosComponent, INPUT_PORT_INDEX, pVideoDec->pMFCDecInputBuffer[i]);
             }
         } else {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
                 if (pOMXComponent == NULL) {
                     Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "%s : %d: invalid parm: pOMXComponent = %p", __FUNCTION__, __LINE__, pOMXComponent);
                 }
@@ -2086,7 +2090,7 @@ OMX_ERRORTYPE Exynos_H264Dec_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
     if (pExynosInputPort->bufferProcessType & BUFFER_COPY) {
         for (i = 0; i < MFC_INPUT_BUFFER_NUM_MAX; i++) {
             if (pVideoDec->pMFCDecInputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                 for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                     if (pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane] != NULL)
                         Exynos_OSAL_SharedMemory_Free(pVideoDec->hSharedMemory, pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane]);
@@ -2151,7 +2155,7 @@ OMX_ERRORTYPE Exynos_H264Dec_SrcIn(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_
         pH264Dec->hMFCH264Handle.indexTimestamp %= MAX_TIMESTAMP;
 
 #ifdef USE_IMMEDIATE_DISPLAY
-    /* Set Immediately display for I Frame*/   
+    /* Set Immediately display for I Frame*/
 
         if (pExynosComponent->checkTimeStamp.needCheckStartTimeStamp == OMX_TRUE) {
             if ( pExynosComponent->checkTimeStamp.bImmediateDisplay == OMX_FALSE) {
@@ -2401,7 +2405,7 @@ OMX_ERRORTYPE Exynos_H264Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX
     pBufferInfo->imageHeight = bufferGeometry->nFrameHeight;
     switch (bufferGeometry->eColorFormat) {
     case VIDEO_COLORFORMAT_NV12:
-#ifdef SLP_PLATFORM /* NV12 fd */
+#ifdef TIZEN_FEATURE_E3250 /* NV12 fd */
         pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
 #else
         pBufferInfo->ColorFormat = OMX_COLOR_FormatYUV420SemiPlanar;
@@ -2438,7 +2442,7 @@ OMX_ERRORTYPE Exynos_H264Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX
         /* For timestamp correction. if mfc support frametype detect */
         Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "disp_pic_frame_type: %d", pVideoBuffer->frameType);
 //#ifdef NEED_TIMESTAMP_REORDER
-        /* SLP_PLATFORM */
+        /* TIZEN_FEATURE_E3250 */
         if (pVideoDec->bNeedTimestampReorder == OMX_TRUE) {
             Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "NEED_TIMESTAMP_REORDER ON");
             if ((pVideoBuffer->frameType == VIDEO_FRAME_I)) {
@@ -2740,13 +2744,13 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent
     Exynos_OSAL_Strcpy(pExynosPort->portDefinition.format.video.cMIMEType, "raw/video");
     pExynosPort->portDefinition.format.video.pNativeRender = 0;
     pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
 #else
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar;
 #endif
     pExynosPort->portDefinition.bEnabled = OMX_TRUE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->bufferProcessType = BUFFER_SHARE;
 #else
     pExynosPort->bufferProcessType = BUFFER_COPY;
@@ -2786,7 +2790,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent
     pVideoDec->exynos_codec_getCodecInputPrivateData  = &GetCodecInputPrivateData;
     pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     pVideoDec->hSharedMemory = Exynos_OSAL_SharedMemory_Open();
     if (pVideoDec->hSharedMemory == NULL) {
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "OMX_ErrorInsufficientResources, Line:%d", __LINE__);
@@ -2825,7 +2829,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(OMX_HANDLETYPE hComponent)
     pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
     pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     Exynos_OSAL_SharedMemory_Close(pVideoDec->hSharedMemory);
 #endif
     Exynos_OSAL_Free(pExynosComponent->componentName);
index f9b4318..8a3f9d5 100755 (executable)
@@ -11,7 +11,6 @@ libOMX_Exynos_AVC_Decoder_la_LIBADD = $(top_builddir)/openmax/osal/libExynosOMX_
                                       $(top_builddir)/openmax/component/common/libExynosOMX_Basecomponent.la \
                                       $(top_builddir)/exynos4/libcodec/video/v4l2/libExynosVideoApi.la \
                                       $(top_builddir)/exynos/libv4l2/libexynosv4l2.la
-                  
 
 
 libOMX_Exynos_AVC_Decoder_la_CFLAGS = -I$(top_srcdir)/openmax/include/khronos \
index 3ae55f5..74e15ac 100755 (executable)
@@ -1433,7 +1433,7 @@ OMX_ERRORTYPE Exynos_Mpeg2Dec_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
     if ((pExynosOutputPort->bufferProcessType & BUFFER_COPY) == BUFFER_COPY) {
         for (i = 0; i < MFC_OUTPUT_BUFFER_NUM_MAX; i++) {
             if (pVideoDec->pMFCDecOutputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                 for (plane = 0; plane < MFC_OUTPUT_BUFFER_PLANE; plane++) {
                     if (pVideoDec->pMFCDecOutputBuffer[i]->pVirAddr[plane] != NULL)
                         Exynos_OSAL_SharedMemory_Free(pVideoDec->hSharedMemory, pVideoDec->pMFCDecOutputBuffer[i]->pVirAddr[plane]);
@@ -1456,7 +1456,7 @@ OMX_ERRORTYPE Exynos_Mpeg2Dec_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
     if ((pExynosInputPort->bufferProcessType & BUFFER_COPY) == BUFFER_COPY) {
         for (i = 0; i < MFC_INPUT_BUFFER_NUM_MAX; i++) {
             if (pVideoDec->pMFCDecInputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                 for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                     if (pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane] != NULL)
                         Exynos_OSAL_SharedMemory_Free(pVideoDec->hSharedMemory, pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane]);
@@ -1745,7 +1745,7 @@ OMX_ERRORTYPE Exynos_Mpeg2Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM
         /* For timestamp correction. if mfc support frametype detect */
         Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "disp_pic_frame_type: %d", pVideoBuffer->frameType);
 //#ifdef NEED_TIMESTAMP_REORDER
-        /* SLP_PLATFORM */
+        /* TIZEN_FEATURE_E3250 */
         if (pVideoDec->bNeedTimestampReorder == OMX_TRUE) {
             if ((pVideoBuffer->frameType == VIDEO_FRAME_I)) {
                 pDstOutputData->timeStamp = pExynosComponent->timeStamp[indexTimestamp];
@@ -2028,7 +2028,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE;
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar;
     pExynosPort->portDefinition.bEnabled = OMX_TRUE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->bufferProcessType = BUFFER_SHARE;
 #else
     pExynosPort->bufferProcessType = BUFFER_COPY | BUFFER_PBSHARE;
@@ -2067,7 +2067,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     pVideoDec->exynos_codec_getCodecInputPrivateData  = &GetCodecInputPrivateData;
     pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     pVideoDec->hSharedMemory = Exynos_OSAL_SharedMemory_Open();
     if (pVideoDec->hSharedMemory == NULL) {
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "OMX_ErrorInsufficientResources, Line:%d", __LINE__);
@@ -2106,7 +2106,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(
     pOMXComponent = (OMX_COMPONENTTYPE *)hComponent;
     pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
     pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle;
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     Exynos_OSAL_SharedMemory_Close(pVideoDec->hSharedMemory);
 #endif
     Exynos_OSAL_Free(pExynosComponent->componentName);
index 2afae9c..d7daa97 100755 (executable)
@@ -655,7 +655,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
     int i, plane;
 
     if (pVideoDec->bThumbnailMode == OMX_TRUE)
-        pDecOps->Set_DisplayDelay(hMFCHandle, 0); 
+        pDecOps->Set_DisplayDelay(hMFCHandle, 0);
 
     /* input buffer info */
     Exynos_OSAL_Memset(&bufferConf, 0, sizeof(bufferConf));
@@ -675,7 +675,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
     } else if (pExynosInputPort->bufferProcessType & BUFFER_COPY) {
         bufferConf.nSizeImage = DEFAULT_MFC_INPUT_BUFFER_SIZE;
         inputBufferNumber = MFC_INPUT_BUFFER_NUM_MAX;
-    }   
+    }
 
     /* should be done before prepare input buffer */
     if (pInbufOps->Enable_Cacheable(hMFCHandle) != VIDEO_ERROR_NONE) {
@@ -688,7 +688,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Failed to set geometry for input buffer");
         ret = OMX_ErrorInsufficientResources;
         goto EXIT;
-    }   
+    }
 
     /* setup input buffer */
     if (pInbufOps->Setup(hMFCHandle, inputBufferNumber) != VIDEO_ERROR_NONE) {
@@ -737,7 +737,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
                 Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "@pVideoDec->pMFCDecInputBuffer[%d]->pVirAddr[%d]: 0x%x", i, plane, pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane]);
             }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             if (pExynosInputPort == NULL || pExynosOutputPort == NULL || pOMXComponent == NULL) {
                 Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "invalid param: pExynosInputPort= %p pExynosOutputPort= %p pOMXComponent= %p", pExynosInputPort, pExynosOutputPort, pOMXComponent);
             }
@@ -1161,7 +1161,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcSetup(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DA
     ret = OMX_ErrorInputDataDecodeYet;
 
 #ifdef USE_IMMEDIATE_DISPLAY
-    /* Set Immediately display for I Frame*/   
+    /* Set Immediately display for I Frame*/
     pDecOps->Set_ImmediateDisplay(hMFCHandle);
 #endif
 EXIT:
@@ -1370,7 +1370,7 @@ OMX_ERRORTYPE Mpeg4CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent)
             if (pVideoDec->bDRCProcessing == OMX_TRUE) {
                 pVideoDec->nDRCSavedBufferCount = pExynosOutputPort->portDefinition.nBufferCountActual;
             }
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             pExynosOutputPort->portDefinition.nBufferCountActual = pMpeg4Dec->hMFCMpeg4Handle.maxDPBNum;
             pExynosOutputPort->portDefinition.nBufferCountMin = pMpeg4Dec->hMFCMpeg4Handle.maxDPBNum;
 #else
@@ -1752,7 +1752,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_SetParameter(
             case OMX_COLOR_FormatYUV420SemiPlanar:
                 pExynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2;
                 break;
-#ifdef SLP_PLATFORM /* NV12 fd */
+#ifdef TIZEN_FEATURE_E3250 /* NV12 fd */
             case OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd:
             case OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd:
                 pExynosOutputPort->portDefinition.nBufferSize = sizeof(MMVideoBuffer);
@@ -2092,7 +2092,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_Init(OMX_COMPONENTTYPE *pOMXComponent)
                 Exynos_CodecBufferEnQueue(pExynosComponent, INPUT_PORT_INDEX, pVideoDec->pMFCDecInputBuffer[i]);
             }
         } else {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
                 if (pOMXComponent == NULL) {
                     Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "%s : %d: invalid parm: pOMXComponent = %p", __FUNCTION__, __LINE__, pOMXComponent);
                 }
@@ -2192,7 +2192,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
     if (pExynosInputPort->bufferProcessType & BUFFER_COPY) {
         for (i = 0; i < MFC_INPUT_BUFFER_NUM_MAX; i++) {
             if (pVideoDec->pMFCDecInputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                 for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                     if (pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane] != NULL)
                         Exynos_OSAL_SharedMemory_Free(pVideoDec->hSharedMemory, pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[plane]);
@@ -2256,7 +2256,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_SrcIn(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX
         pMpeg4Dec->hMFCMpeg4Handle.indexTimestamp %= MAX_TIMESTAMP;
 
 #ifdef USE_IMMEDIATE_DISPLAY
-    /* Set Immediately display for I Frame*/   
+    /* Set Immediately display for I Frame*/
         if (pExynosComponent->checkTimeStamp.needCheckStartTimeStamp == OMX_TRUE) {
             if ( pExynosComponent->checkTimeStamp.bImmediateDisplay == OMX_FALSE) {
                 /* Enable Immediately display After seek*/
@@ -2498,7 +2498,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM
     pBufferInfo->imageHeight = bufferGeometry->nFrameHeight;
     switch (bufferGeometry->eColorFormat) {
     case VIDEO_COLORFORMAT_NV12:
-#ifdef SLP_PLATFORM /* NV12 fd */
+#ifdef TIZEN_FEATURE_E3250 /* NV12 fd */
         pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
 #else
         pBufferInfo->ColorFormat = OMX_COLOR_FormatYUV420SemiPlanar;
@@ -2527,7 +2527,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM
         Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "disp_pic_frame_type: %d", pVideoBuffer->frameType);
 //#ifdef NEED_TIMESTAMP_REORDER
         if (pMpeg4Dec->hMFCMpeg4Handle.bPackedPB == OMX_TRUE ||
-            pVideoDec->bNeedTimestampReorder == OMX_TRUE) { /* SLP_PLATFORM */
+            pVideoDec->bNeedTimestampReorder == OMX_TRUE) { /* TIZEN_FEATURE_E3250 */
             if ((pVideoBuffer->frameType == VIDEO_FRAME_I)) {
                 pDstOutputData->timeStamp = pExynosComponent->timeStamp[indexTimestamp];
                 pDstOutputData->nFlags = pExynosComponent->nFlags[indexTimestamp];
@@ -2831,7 +2831,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent
     Exynos_OSAL_Strcpy(pExynosPort->portDefinition.format.video.cMIMEType, "raw/video");
     pExynosPort->portDefinition.format.video.pNativeRender = 0;
     pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
     pExynosPort->bufferProcessType = BUFFER_SHARE;
 #else
@@ -2887,7 +2887,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent
     pVideoDec->exynos_codec_getCodecInputPrivateData  = &GetCodecInputPrivateData;
     pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     pVideoDec->hSharedMemory = Exynos_OSAL_SharedMemory_Open();
     if (pVideoDec->hSharedMemory == NULL) {
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "OMX_ErrorInsufficientResources, Line:%d", __LINE__);
@@ -2925,7 +2925,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(OMX_HANDLETYPE hComponent)
     pOMXComponent = (OMX_COMPONENTTYPE *)hComponent;
     pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
     pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle;
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     Exynos_OSAL_SharedMemory_Close(pVideoDec->hSharedMemory);
 #endif
     Exynos_OSAL_Free(pExynosComponent->componentName);
old mode 100644 (file)
new mode 100755 (executable)
index b14d8e0..7897a37
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <mm_types.h>
 
 #include "Exynos_OMX_Macros.h"
 #include "Exynos_OMX_Basecomponent.h"
@@ -245,14 +246,14 @@ static OMX_BOOL Make_Stream_MetaData(
     OMX_U8    *pInputStream,
     OMX_U32   *pStreamSize,
     WMV_FORMAT wmvFormat
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     , OMX_U32 width, OMX_U32 height
 #endif
     )
 {
     OMX_U8  *pCurrBuf = pInputStream;
     OMX_U32  currPos  = 0;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     OMX_U32  width, height;
 #endif
     FunctionIn();
@@ -269,7 +270,7 @@ static OMX_BOOL Make_Stream_MetaData(
     switch (wmvFormat) {
     case WMV_FORMAT_WMV3:
         if (*pStreamSize >= BITMAPINFOHEADER_SIZE) {
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
             BitmapInfoHhr *pBitmapInfoHeader;
             pBitmapInfoHeader = (BitmapInfoHhr *)pInputStream;
 
@@ -384,14 +385,14 @@ OMX_ERRORTYPE Process_Wmv_CodecConfigData(OMX_COMPONENTTYPE *pOMXComponent, void
     EXYNOS_OMX_BASEPORT      *pExynosOutputPort = &pExynosComponent->pExynosPort[OUTPUT_PORT_INDEX];
     EXYNOS_WMVDEC_HANDLE          *pWmvDec           = (EXYNOS_WMVDEC_HANDLE *)pVideoDec->hCodecHandle;
     OMX_PTR                hMFCHandle = pWmvDec->hMFCWmvHandle.hMFCHandle;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     EXYNOS_OMX_DATABUFFER *pSrcInputData = (EXYNOS_OMX_DATA *)pConfig;
     OMX_U8 *pInputStream = pSrcInputData->bufferHeader->pBuffer;
 #endif
 
     FunctionIn();
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     if (pWmvDec->wmvFormat == WMV_FORMAT_UNKNOWN) {
         Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "Process_Wmv_CodecConfigData. dataLen = %d", pSrcInputData->dataLen);
         if (pSrcInputData->dataLen < 4) {
@@ -1177,7 +1178,7 @@ OMX_ERRORTYPE WmvCodecSrcSetup(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
     }
 
     bMetaData = Make_Stream_MetaData(pSrcInputData->buffer.singlePlaneBuffer.dataBuffer, &oneFrameSize, pWmvDec->hMFCWmvHandle.wmvFormat
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
         , pExynosComponent->pExynosPort[INPUT_PORT_INDEX].portDefinition.format.video.nFrameWidth
         , pExynosComponent->pExynosPort[INPUT_PORT_INDEX].portDefinition.format.video.nFrameHeight
 #endif
@@ -1215,7 +1216,7 @@ OMX_ERRORTYPE WmvCodecSrcSetup(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
     ret = OMX_ErrorInputDataDecodeYet;
 
 #ifdef USE_IMMEDIATE_DISPLAY
-    /* Set Immediately display for I Frame*/   
+    /* Set Immediately display for I Frame*/
     pDecOps->Set_ImmediateDisplay(hMFCHandle);
 #endif
 EXIT:
@@ -1423,7 +1424,7 @@ OMX_ERRORTYPE WmvCodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent)
             if (pVideoDec->bDRCProcessing == OMX_TRUE) {
                 pVideoDec->nDRCSavedBufferCount = pExynosOutputPort->portDefinition.nBufferCountActual;
             }
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             pExynosOutputPort->portDefinition.nBufferCountActual = pWmvDec->hMFCWmvHandle.maxDPBNum;
             pExynosOutputPort->portDefinition.nBufferCountMin = pWmvDec->hMFCWmvHandle.maxDPBNum;
 #else
@@ -1683,9 +1684,9 @@ OMX_ERRORTYPE Exynos_WmvDec_SetParameter(
             case OMX_COLOR_FormatYUV420SemiPlanar:
                 pExynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2;
                 break;
-#ifdef SLP_PLATFORM /* NV12T fd */
+#ifdef TIZEN_FEATURE_E3250 /* NV12T fd */
             case OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd:
-                pExynosOutputPort->portDefinition.nBufferSize = sizeof(SCMN_IMGB);
+                pExynosOutputPort->portDefinition.nBufferSize = sizeof(MMVideoBuffer);
                 break;
 #endif
             case OMX_SEC_COLOR_FormatNV12Tiled:
@@ -2140,7 +2141,7 @@ OMX_ERRORTYPE Exynos_WmvDec_SrcIn(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_D
         pWmvDec->hMFCWmvHandle.indexTimestamp %= MAX_TIMESTAMP;
 
 #ifdef USE_IMMEDIATE_DISPLAY
-    /* Set Immediately display for I Frame*/   
+    /* Set Immediately display for I Frame*/
         if (pExynosComponent->checkTimeStamp.needCheckStartTimeStamp == OMX_TRUE) {
             if ( pExynosComponent->checkTimeStamp.bImmediateDisplay == OMX_FALSE) {
                 /* Enable Immediately display After seek*/
@@ -2149,7 +2150,7 @@ OMX_ERRORTYPE Exynos_WmvDec_SrcIn(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_D
             }
         }
 #endif
-       
+
         /* queue work for input buffer */
         Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "oneFrameSize: %d, bufferHeader: 0x%x, dataBuffer: 0x%x", oneFrameSize, pSrcInputData->bufferHeader, pSrcInputData->buffer.singlePlaneBuffer.dataBuffer);
         codecReturn = pInbufOps->Enqueue(hMFCHandle, (unsigned char **)&pSrcInputData->buffer.singlePlaneBuffer.dataBuffer,
@@ -2380,7 +2381,7 @@ OMX_ERRORTYPE Exynos_WmvDec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_
     pBufferInfo->imageHeight = bufferGeometry->nFrameHeight;
     switch (bufferGeometry->eColorFormat) {
     case VIDEO_COLORFORMAT_NV12:
-#ifdef SLP_PLATFORM /* NV12T fd */
+#ifdef TIZEN_FEATURE_E3250 /* NV12T fd */
         pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd;
 #else
         pBufferInfo->ColorFormat = OMX_COLOR_FormatYUV420SemiPlanar;
@@ -2409,7 +2410,7 @@ OMX_ERRORTYPE Exynos_WmvDec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_
         Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "disp_pic_frame_type: %d", pVideoBuffer->frameType);
 
 //#ifdef NEED_TIMESTAMP_REORDER
-        if (pVideoDec->bNeedTimestampReorder == OMX_TRUE) { /* SLP_PLATFORM */
+        if (pVideoDec->bNeedTimestampReorder == OMX_TRUE) { /* TIZEN_FEATURE_E3250 */
             if ((pVideoBuffer->frameType == VIDEO_FRAME_I)) {
                 pDstOutputData->timeStamp = pExynosComponent->timeStamp[indexTimestamp];
                 pDstOutputData->nFlags = pExynosComponent->nFlags[indexTimestamp];
@@ -2699,13 +2700,13 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     Exynos_OSAL_Strcpy(pExynosPort->portDefinition.format.video.cMIMEType, "raw/video");
     pExynosPort->portDefinition.format.video.pNativeRender = 0;
     pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd;
 #else
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar;
 #endif
     pExynosPort->portDefinition.bEnabled = OMX_TRUE;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->bufferProcessType = BUFFER_SHARE;
 #else
     pExynosPort->bufferProcessType = BUFFER_COPY;
@@ -2718,7 +2719,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
         pWmvDec->WmvComponent[i].eFormat    = OMX_VIDEO_WMVFormat9;
     }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pWmvDec->wmvFormat = WMV_FORMAT_UNKNOWN;
 #endif
 
@@ -2750,7 +2751,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
 
     pVideoDec->exynos_process_codecConfigData                 = &Process_Wmv_CodecConfigData;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     pVideoDec->hSharedMemory = Exynos_OSAL_SharedMemory_Open();
     if (pVideoDec->hSharedMemory == NULL) {
         Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "OMX_ErrorInsufficientResources, Line:%d", __LINE__);
@@ -2789,7 +2790,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(
     pOMXComponent = (OMX_COMPONENTTYPE *)hComponent;
     pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
     pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle;
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     Exynos_OSAL_SharedMemory_Close(pVideoDec->hSharedMemory);
 #endif
     Exynos_OSAL_Free(pExynosComponent->componentName);
index f614c83..06ff2ed 100755 (executable)
@@ -33,7 +33,7 @@
 #include "OMX_Video.h"
 #include "ExynosVideoApi.h"
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 #define BITMAPINFOHEADER_SIZE               0
 #define BITMAPINFOHEADER_ASFBINDING_SIZE    1
 #else
@@ -97,7 +97,7 @@ typedef struct _EXYNOS_WMVDEC_HANDLE
     OMX_BOOL bDestinationStart;
     OMX_HANDLETYPE hSourceStartEvent;
     OMX_HANDLETYPE hDestinationStartEvent;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     WMV_FORMAT wmvFormat;
 #endif
 } EXYNOS_WMVDEC_HANDLE;
index abb2fb5..d63def8 100755 (executable)
@@ -24,6 +24,9 @@ libOMX_Exynos_WMV_Decoder_la_CFLAGS = -I$(top_srcdir)/openmax/include/khronos \
                                    -I$(top_srcdir)/exynos4/libcodec/video/v4l2/include \
                                    -I$(top_srcdir)/exynos/include
 
+libOMX_Exynos_WMV_Decoder_la_LIBADD += $(MM_COMMON_LIB)
+libOMX_Exynos_WMV_Decoder_la_CFLAGS += $(MM_COMMON_CFLAGS)
+
 if BOARD_USE_ANB
 libOMX_Exynos_WMV_Decoder_la_CFLAGS += -DUSE_ANB
 endif
index 4d45cd2..5ce89c6 100755 (executable)
@@ -427,7 +427,7 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                 ret = OMX_FALSE;
             }
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
             if (((exynosInputPort->bStoreMetaData == OMX_TRUE) && (eColorFormat == OMX_COLOR_FormatAndroidOpaque)) ||
                 (exynosInputPort->bStoreMetaData == OMX_FALSE))
 #else
old mode 100644 (file)
new mode 100755 (executable)
index 4cdba14..426123c
@@ -57,7 +57,7 @@
 #define MFC_INPUT_BUFFER_PLANE              2
 #define MFC_OUTPUT_BUFFER_PLANE             1
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 /* FIXME: for camera slow motion 12 buffer and eos issue, we increase this value */
 /* FIXME: for trim small resolution video. dec + enc case */
 #define MAX_CAMERA_INPUTBUFFER_NUM          25 /* number of metadata buffer */
index c46dde3..7053059 100755 (executable)
@@ -127,7 +127,7 @@ OMX_ERRORTYPE Exynos_OMX_UseBuffer(
                 pTempBufferHdr->nInputPortIndex = INPUT_PORT_INDEX;
             else
                 pTempBufferHdr->nOutputPortIndex = OUTPUT_PORT_INDEX;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
             if (nPortIndex == OUTPUT_PORT_INDEX && pVideoEnc->bSharedOutputFD == OMX_TRUE)
                 pExynosPort->extendBufferHeader[i].buf_fd[0] = (int)(pBuffer); /*IL Client provides only FD value*/
 
@@ -479,7 +479,7 @@ OMX_ERRORTYPE Exynos_OMX_FlushPort(
     int                       i                 = 0;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "flushPort idx:%d", nPortIndex);
 #endif
 
@@ -594,7 +594,7 @@ OMX_ERRORTYPE Exynos_OMX_BufferFlush(
     OMX_U32                          i                  = 0;
 
     FunctionIn();
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "bufferFlush idx:%d", nPortIndex);
 #endif
 
@@ -872,7 +872,7 @@ OMX_ERRORTYPE Exynos_InputBufferGetQueue(
 
             Exynos_OSAL_Free(pMessage);
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
             if (pDataBuffer->allocSize <= pDataBuffer->dataLen)
                 Exynos_OSAL_Log(EXYNOS_LOG_WARNING, "Input Buffer Full, Check input buffer size! allocSize:%d, dataLen:%d", pDataBuffer->allocSize, pDataBuffer->dataLen);
 #endif
@@ -1334,7 +1334,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoEncodeGetParameter(
                 pPortFormat->xFramerate         = pPortDef->format.video.xFramerate;
                 break;
             case supportFormat_4:
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
                 Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "can not support this format");
 #else
                 pPortFormat->eCompressionFormat = OMX_VIDEO_CodingUnused;
old mode 100644 (file)
new mode 100755 (executable)
index b9f10da..9a223b5
@@ -285,7 +285,7 @@ static void Set_H264Enc_Param(EXYNOS_OMX_BASECOMPONENT *pExynosComponent)
     pH264Param->NumberBFrames = 0;    /* 0 ~ 2 */
     pH264Param->NumberReferenceFrames = 1;
     pH264Param->NumberRefForPframes   = 1;
-#ifdef SLP_PLATFORM /* for B2 camera */
+#ifdef TIZEN_FEATURE_E3250 /* for B2 camera */
     pH264Param->LoopFilterDisable     = 0;    /* 1: Loop Filter Disable, 0: Filter Enable */
 #else
     pH264Param->LoopFilterDisable     = 1;    /* 1: Loop Filter Disable, 0: Filter Enable */
@@ -778,7 +778,7 @@ OMX_ERRORTYPE H264CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
             /*************/
             /* Does not require any actions. */
         } else {
-#ifndef SLP_PLATFORM /* slp platform can go into here */
+#ifndef TIZEN_FEATURE_E3250 /* slp platform can go into here */
             Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Failed to get input buffer info");
             ret = OMX_ErrorNotImplemented;
             goto EXIT;
@@ -1168,7 +1168,7 @@ OMX_ERRORTYPE Exynos_H264Enc_GetParameter(
         Exynos_OSAL_Memcpy(pDstAVCComponent, pSrcAVCComponent, sizeof(OMX_VIDEO_PARAM_AVCTYPE));
     }
         break;
-               
+
     case  OMX_IndexParamVideoSliceFMO:
     {
         OMX_VIDEO_PARAM_AVCSLICEFMO *pDstSliceFmo = (OMX_VIDEO_PARAM_AVCSLICEFMO *)pComponentParameterStructure;
@@ -1428,7 +1428,7 @@ OMX_ERRORTYPE Exynos_H264Enc_SetParameter(
     }
         break;
 #endif
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     case OMX_IndexParamSharedOutputFD:
     {
         EXYNOS_OMX_VIDEOENC_COMPONENT *pVideoEnc = NULL;
@@ -1621,7 +1621,7 @@ OMX_ERRORTYPE Exynos_H264Enc_GetExtensionIndex(
     if (Exynos_OSAL_Strcmp(cParameterName, EXYNOS_INDEX_CONFIG_VIDEO_INTRAPERIOD) == 0) {
         *pIndexType = OMX_IndexConfigVideoIntraPeriod;
         ret = OMX_ErrorNone;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     } else if (Exynos_OSAL_Strcmp(cParameterName, EXYNOS_INDEX_PARAM_ENC_SHARED_OUTPUT_FD) == 0) {
         *pIndexType = (OMX_INDEXTYPE) OMX_IndexParamSharedOutputFD;
         goto EXIT;
@@ -1696,7 +1696,7 @@ OMX_ERRORTYPE Exynos_H264Enc_Init(OMX_COMPONENTTYPE *pOMXComponent)
 
     eColorFormat = pExynosInputPort->portDefinition.format.video.eColorFormat;
     if (pExynosInputPort->bStoreMetaData == OMX_TRUE) {
-#ifndef SLP_PLATFORM /* we do not use OMX_COLOR_FormatAndroidOpaque */
+#ifndef TIZEN_FEATURE_E3250 /* we do not use OMX_COLOR_FormatAndroidOpaque */
         if (eColorFormat == OMX_COLOR_FormatAndroidOpaque) {
             pExynosInputPort->bufferProcessType = BUFFER_COPY;
         } else {
@@ -1712,7 +1712,7 @@ OMX_ERRORTYPE Exynos_H264Enc_Init(OMX_COMPONENTTYPE *pOMXComponent)
         }
     }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     if (pVideoEnc->bSharedOutputFD == OMX_TRUE) {
         pExynosOutputPort->bufferProcessType = BUFFER_SHARE;
     } else {
@@ -1851,7 +1851,7 @@ OMX_ERRORTYPE Exynos_H264Enc_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
     if (pExynosOutputPort->bufferProcessType & BUFFER_COPY) {
         for (i = 0; i < MFC_OUTPUT_BUFFER_NUM_MAX; i++) {
             if (pVideoEnc->pMFCEncOutputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                 if (pVideoEnc->pMFCEncOutputBuffer[i]->pVirAddr[0] != NULL)
                     Exynos_OSAL_SharedMemory_Free(pVideoEnc->hSharedMemory, pVideoEnc->pMFCEncOutputBuffer[i]->pVirAddr[0]);
 #endif
@@ -1873,7 +1873,7 @@ OMX_ERRORTYPE Exynos_H264Enc_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
         if (pH264Enc->hMFCH264Handle.bShareableBuf == OMX_TRUE) {
             for (i = 0; i < MFC_INPUT_BUFFER_NUM_MAX; i++) {
                 if (pVideoEnc->pMFCEncInputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                     for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                         if (pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[plane] != NULL)
                             Exynos_OSAL_SharedMemory_Free(pVideoEnc->hSharedMemory, pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[plane]);
@@ -2460,7 +2460,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     pExynosPort->portDefinition.format.video.eCompressionFormat = OMX_VIDEO_CodingUnused;
     Exynos_OSAL_Memset(pExynosPort->portDefinition.format.video.cMIMEType, 0, MAX_OMX_MIMETYPE_SIZE);
     Exynos_OSAL_Strcpy(pExynosPort->portDefinition.format.video.cMIMEType, "raw/video");
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
 #else
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420SemiPlanar;
@@ -2517,7 +2517,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     pVideoEnc->exynos_codec_getCodecInputPrivateData  = &GetCodecInputPrivateData;
     pVideoEnc->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     pVideoEnc->hSharedMemory = Exynos_OSAL_SharedMemory_Open();
     if (pVideoEnc->hSharedMemory == NULL) {
         Exynos_OSAL_Free(pH264Enc);
@@ -2554,7 +2554,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(OMX_HANDLETYPE hComponent)
     pOMXComponent = (OMX_COMPONENTTYPE *)hComponent;
     pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
     pVideoEnc = (EXYNOS_OMX_VIDEOENC_COMPONENT *)pExynosComponent->hComponentHandle;
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     Exynos_OSAL_SharedMemory_Close(pVideoEnc->hSharedMemory);
 #endif
     Exynos_OSAL_Free(pExynosComponent->componentName);
index c8b189f..c3519a0 100755 (executable)
@@ -245,7 +245,7 @@ static void Set_Mpeg4Enc_Param(EXYNOS_OMX_BASECOMPONENT *pExynosComponent)
     switch ((EXYNOS_OMX_COLOR_FORMATTYPE)pExynosInputPort->portDefinition.format.video.eColorFormat) {
     case OMX_COLOR_FormatYUV420SemiPlanar:
     case OMX_COLOR_FormatYUV420Planar: /* Converted to NV12 in Exynos_Preprocessor_InputData */
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     case OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd:
 #endif
 #ifdef USE_METADATABUFFERTYPE
@@ -345,7 +345,7 @@ static void Set_H263Enc_Param(EXYNOS_OMX_BASECOMPONENT *pExynosComponent)
     switch ((EXYNOS_OMX_COLOR_FORMATTYPE)pExynosInputPort->portDefinition.format.video.eColorFormat) {
     case OMX_COLOR_FormatYUV420SemiPlanar:
     case OMX_COLOR_FormatYUV420Planar: /* Converted to NV12 in Exynos_Preprocessor_InputData */
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     case OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd:
 #endif
 #ifdef USE_METADATABUFFERTYPE
@@ -892,7 +892,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent)
             /*************/
             /* Does not require any actions. */
         } else {
-#ifndef SLP_PLATFORM /* slp platform can go into here */
+#ifndef TIZEN_FEATURE_E3250 /* slp platform can go into here */
             Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Failed to get input buffer info");
             ret = OMX_ErrorNotImplemented;
             goto EXIT;
@@ -1837,7 +1837,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_Init(OMX_COMPONENTTYPE *pOMXComponent)
 
     eColorFormat = pExynosInputPort->portDefinition.format.video.eColorFormat;
     if (pExynosInputPort->bStoreMetaData == OMX_TRUE) {
-#ifndef SLP_PLATFORM /* we do not use OMX_COLOR_FormatAndroidOpaque */
+#ifndef TIZEN_FEATURE_E3250 /* we do not use OMX_COLOR_FormatAndroidOpaque */
         if (eColorFormat == OMX_COLOR_FormatAndroidOpaque) {
             pExynosInputPort->bufferProcessType = BUFFER_COPY;
         } else {
@@ -1985,7 +1985,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
         if (pMpeg4Enc->hMFCMpeg4Handle.bShareableBuf == OMX_TRUE) {
             for (i = 0; i < MFC_INPUT_BUFFER_NUM_MAX; i++) {
                 if (pVideoEnc->pMFCEncInputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                     for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                         if (pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[plane] != NULL)
                             Exynos_OSAL_SharedMemory_Free(pVideoEnc->hSharedMemory, pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[plane]);
@@ -2009,7 +2009,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_Terminate(OMX_COMPONENTTYPE *pOMXComponent)
     if (pExynosInputPort->bufferProcessType & BUFFER_COPY) {
         for (i = 0; i < MFC_INPUT_BUFFER_NUM_MAX; i++) {
             if (pVideoEnc->pMFCEncInputBuffer[i] != NULL) {
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
                 for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                     if (pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[plane] != NULL)
                         Exynos_OSAL_SharedMemory_Free(pVideoEnc->hSharedMemory, pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[plane]);
@@ -2073,7 +2073,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_SrcIn(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX
         pVideoEnc->configChange = OMX_FALSE;
     }
 
-     
+
     if ((pSrcInputData->dataLen >= 0) ||
         ((pSrcInputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
         OMX_U32 pMFCYUVDataSize[MFC_INPUT_BUFFER_PLANE]  = {NULL, NULL};
@@ -2570,7 +2570,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE;
     Exynos_OSAL_Memset(pExynosPort->portDefinition.format.video.cMIMEType, 0, MAX_OMX_MIMETYPE_SIZE);
     Exynos_OSAL_Strcpy(pExynosPort->portDefinition.format.video.cMIMEType, "raw/video");
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd;
 #else
     pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420SemiPlanar;
@@ -2658,7 +2658,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
     pVideoEnc->exynos_codec_getCodecInputPrivateData  = &GetCodecInputPrivateData;
     pVideoEnc->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData;
 
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     pVideoEnc->hSharedMemory = Exynos_OSAL_SharedMemory_Open();
     if (pVideoEnc->hSharedMemory == NULL) {
         Exynos_OSAL_Free(pMpeg4Enc);
@@ -2695,7 +2695,7 @@ OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(OMX_HANDLETYPE hComponent)
     pOMXComponent = (OMX_COMPONENTTYPE *)hComponent;
     pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
     pVideoEnc = (EXYNOS_OMX_VIDEOENC_COMPONENT *)pExynosComponent->hComponentHandle;
-#ifndef SLP_PLATFORM /* do not use ion */
+#ifndef TIZEN_FEATURE_E3250 /* do not use ion */
     Exynos_OSAL_SharedMemory_Close(pVideoEnc->hSharedMemory);
 #endif
     Exynos_OSAL_Free(pExynosComponent->componentName);
old mode 100644 (file)
new mode 100755 (executable)
index 655becd..baa3a86
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#ifdef SLP_PLATFORM /* build env */
+#ifdef TIZEN_FEATURE_E3250 /* build env */
 #define Exynos_OMX_Init                    OMX_Init
 #define Exynos_OMX_Deinit                  OMX_Deinit
 #define Exynos_OMX_ComponentNameEnum       OMX_ComponentNameEnum
index c533aa9..8c66038 100755 (executable)
 #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,
old mode 100644 (file)
new mode 100755 (executable)
index 0d31d8b..752a5f8
@@ -23,7 +23,7 @@
  * @history
  *   2012.02.20 : Create
  */
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <utils/Log.h>
 #else
 #ifdef USE_DLOG
 
 #include "Exynos_OSAL_Log.h"
 
-#ifdef SLP_PLATFORM /* build env */
+#ifdef TIZEN_FEATURE_E3250 /* build env */
 static int component_debug_level = -1;
 #endif
 
 void _Exynos_OSAL_Log(EXYNOS_LOG_LEVEL logLevel, const char *tag, const char *msg, ...)
 {
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     va_list argptr;
 
     va_start(argptr, msg);
old mode 100644 (file)
new mode 100755 (executable)
index 3e14116..66657cb
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
 #ifndef EXYNOS_LOG_OFF
 #define EXYNOS_LOG
 #endif
@@ -44,11 +44,11 @@ extern "C" {
 #ifdef EXYNOS_TRACE_ON
 #define EXYNOS_TRACE
 #endif
-#endif /* SLP_PLATFORM */
+#endif /* TIZEN_FEATURE_E3250 */
 
 typedef enum _LOG_LEVEL
 {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     EXYNOS_LOG_VERVOSE,
 #endif
     EXYNOS_LOG_TRACE,
@@ -57,7 +57,7 @@ typedef enum _LOG_LEVEL
     EXYNOS_LOG_ERROR
 } EXYNOS_LOG_LEVEL;
 
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
 
 #ifdef EXYNOS_LOG
 #define Exynos_OSAL_Log(a, ...)    ((void)_Exynos_OSAL_Log(a, EXYNOS_LOG_TAG, __VA_ARGS__))
@@ -77,7 +77,7 @@ typedef enum _LOG_LEVEL
 #define FunctionOut() ((void *)0)
 #endif
 
-#else /* SLP_PLATFORM */
+#else /* TIZEN_FEATURE_E3250 */
 
 #define OMX_DEBUG_LEVEL 2 /* EXYNOS_LOG_INFO */
 
@@ -97,7 +97,7 @@ typedef enum _LOG_LEVEL
 #define FunctionOut() _Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, EXYNOS_LOG_TAG, EXYNOS_LOG_TAG"] %s Out , Line: %d", __FUNCTION__, __LINE__)
 #endif
 
-#endif /* SLP_PLATFORM */
+#endif /* TIZEN_FEATURE_E3250 */
 
 extern void _Exynos_OSAL_Log(EXYNOS_LOG_LEVEL logLevel, const char *tag, const char *msg, ...);
 
old mode 100644 (file)
new mode 100755 (executable)
index 70552c4..04c9d84
@@ -39,7 +39,7 @@ static int mem_cnt = 0;
 OMX_PTR Exynos_OSAL_Malloc(OMX_U32 size)
 {
     mem_cnt++;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "alloc count: %d", mem_cnt);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "alloc count: %d", mem_cnt);
@@ -51,7 +51,7 @@ OMX_PTR Exynos_OSAL_Malloc(OMX_U32 size)
 void Exynos_OSAL_Free(OMX_PTR addr)
 {
     mem_cnt--;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "free count: %d", mem_cnt);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "free count: %d", mem_cnt);
index 69c9dad..a0be86a 100755 (executable)
@@ -118,7 +118,7 @@ OMX_ERRORTYPE Exynos_OSAL_UnlockPBHandle(OMX_IN OMX_U32 handle)
     FunctionIn();
 
     OMX_ERRORTYPE ret = OMX_ErrorNone;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 #else
     GraphicBufferMapper &mapper = GraphicBufferMapper::get();
     buffer_handle_t bufferHandle = (buffer_handle_t) handle;
@@ -151,7 +151,7 @@ OMX_ERRORTYPE Exynos_OSAL_LockPB(
     FunctionIn();
 
     OMX_ERRORTYPE ret = OMX_ErrorNone;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 
     ExynosVideoPlane *vplanes = (ExynosVideoPlane *) planes;
     MMVideoBuffer *buffer = (MMVideoBuffer *) pBuffer;
@@ -183,7 +183,7 @@ EXIT:
     return ret;
 }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 OMX_ERRORTYPE Exynos_OSAL_UnlockPB(OMX_IN OMX_PTR pBuffer, EXYNOS_OMX_DATA *pData, EXYNOS_OMX_BASEPORT *pExynosPort,EXYNOS_OMX_BASEPORT *pExynosInPort)
 #else
 OMX_ERRORTYPE Exynos_OSAL_UnlockPB(OMX_IN OMX_PTR pBuffer, EXYNOS_OMX_DATA *pData)
@@ -192,7 +192,7 @@ OMX_ERRORTYPE Exynos_OSAL_UnlockPB(OMX_IN OMX_PTR pBuffer, EXYNOS_OMX_DATA *pDat
     FunctionIn();
 
     OMX_ERRORTYPE ret = OMX_ErrorNone;
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     MMVideoBuffer *pSlpOutBuf = NULL;
     DECODE_CODEC_EXTRA_BUFFERINFO *pBufferInfo = NULL;
 
@@ -411,7 +411,7 @@ OMX_ERRORTYPE Exynos_OSAL_GetPBParameter(
     }
 
     switch (nIndex) {
-#if 0 /* SLP_PLATFORM */
+#if 0 /* TIZEN_FEATURE_E3250 */
     case OMX_IndexParamGetAndroidNativeBuffer:
     {
         GetAndroidNativeBufferUsageParams *pANBParams = (GetAndroidNativeBufferUsageParams *) ComponentParameterStructure;
@@ -495,7 +495,7 @@ OMX_ERRORTYPE Exynos_OSAL_SetPBParameter(
     pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle;
 
     switch (nIndex) {
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
     case OMX_IndexParamEnablePlatformSpecificBuffers:
 #else
     case OMX_IndexParamEnableAndroidBuffers:
@@ -524,7 +524,7 @@ OMX_ERRORTYPE Exynos_OSAL_SetPBParameter(
             goto EXIT;
         }
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
          /* PB and DPB Buffer Sharing */
         if ((portIndex == OUTPUT_PORT_INDEX) &&
             ((pExynosPort->bufferProcessType & BUFFER_PBSHARE) == BUFFER_PBSHARE)) {
@@ -545,7 +545,7 @@ OMX_ERRORTYPE Exynos_OSAL_SetPBParameter(
     }
         break;
 
-#if 0 /* SLP_PLATFORM */
+#if 0 /* TIZEN_FEATURE_E3250 */
     case OMX_IndexParamUseAndroidNativeBuffer:
     {
         UseAndroidNativeBufferParams *pANBParams = (UseAndroidNativeBufferParams *) ComponentParameterStructure;
index 488b93e..672d407 100755 (executable)
@@ -70,7 +70,7 @@ OMX_ERRORTYPE Exynos_OSAL_LockPB(OMX_IN OMX_PTR pBuffer,
                                   OMX_OUT OMX_U32 *pStride,
                                   OMX_OUT OMX_PTR planes);
 
-#ifdef SLP_PLATFORM
+#ifdef TIZEN_FEATURE_E3250
 OMX_ERRORTYPE Exynos_OSAL_UnlockPB(OMX_IN OMX_PTR pBuffer, OMX_IN EXYNOS_OMX_DATA *pData, EXYNOS_OMX_BASEPORT *pExynosPort, EXYNOS_OMX_BASEPORT *pExynosInPort);
 #else
 OMX_ERRORTYPE Exynos_OSAL_UnlockPB(OMX_IN OMX_PTR pBuffer, OMX_IN EXYNOS_OMX_DATA *pData);
@@ -88,7 +88,7 @@ OMX_ERRORTYPE Exynos_OSAL_UnlockPBHandle(OMX_IN OMX_U32 pBuffer);
 OMX_ERRORTYPE Exynos_OSAL_GetInfoFromMetaData(OMX_IN OMX_BYTE pBuffer,
                                               OMX_OUT OMX_PTR *pOutBuffer);
 
-#if 0 /* SLP_PLATFORM */
+#if 0 /* TIZEN_FEATURE_E3250 */
 OMX_ERRORTYPE Exynos_OSAL_CheckPB(OMX_IN EXYNOS_OMX_DATA *pBuffer,
                                    OMX_OUT OMX_BOOL *bIsPBEnabled);
 #endif
old mode 100644 (file)
new mode 100755 (executable)
index 6fa1a25..93c2416
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <errno.h>
 #include <pthread.h>
-#ifndef SLP_PLATFORM /* build env */
+#ifndef TIZEN_FEATURE_E3250 /* build env */
 #include <cutils/log.h>
 #include <cutils/atomic.h>
 #endif
@@ -211,7 +211,7 @@ OMX_PTR Exynos_OSAL_SharedMemory_Alloc(OMX_HANDLETYPE handle, OMX_U32 size, MEMO
     Exynos_OSAL_MutexUnlock(pHandle->hSMMutex);
 
     mem_cnt++;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "SharedMemory alloc count: %d", mem_cnt);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "SharedMemory alloc count: %d", mem_cnt);
@@ -273,7 +273,7 @@ void Exynos_OSAL_SharedMemory_Free(OMX_HANDLETYPE handle, OMX_PTR pBuffer)
     Exynos_OSAL_Free(pDeleteElement);
 
     mem_cnt--;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "SharedMemory free count: %d", mem_cnt);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "SharedMemory free count: %d", mem_cnt);
@@ -334,7 +334,7 @@ OMX_PTR Exynos_OSAL_SharedMemory_Map(OMX_HANDLETYPE handle, OMX_U32 size, unsign
     Exynos_OSAL_MutexUnlock(pHandle->hSMMutex);
 
     mem_cnt++;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "SharedMemory alloc count: %d", mem_cnt);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "SharedMemory alloc count: %d", mem_cnt);
@@ -393,7 +393,7 @@ void Exynos_OSAL_SharedMemory_Unmap(OMX_HANDLETYPE handle, unsigned int ionfd)
     Exynos_OSAL_Free(pDeleteElement);
 
     mem_cnt--;
-#ifndef SLP_PLATFORM
+#ifndef TIZEN_FEATURE_E3250
     Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "SharedMemory free count: %d", mem_cnt);
 #else
     Exynos_OSAL_Log(EXYNOS_LOG_VERVOSE, "SharedMemory free count: %d", mem_cnt);
index 5f62e2c..a95793f 100755 (executable)
@@ -1,6 +1,6 @@
 Name: libomxil-e3250-v4l2
 Summary: OpenMAX IL for e3250-v4l2
-Version: 0.1.2
+Version: 0.1.3
 License: Apache-2.0
 Group: Development/Libraries
 Release: 0
old mode 100755 (executable)
new mode 100644 (file)
index d7cc67a..00ff12c
--- a/srp.pc.in
+++ b/srp.pc.in
@@ -8,5 +8,5 @@ Version: @VERSION@
 Requires:
 Libs: -L${libdir} -lsrp
 
-Cflags: -I${includedir}/srp -DSLP_PLATFORM
+Cflags: -I${includedir}/srp -DTIZEN_FEATURE_E3250