exynos_omx: multi_thread: Code clean-up.
authorSeungBeom Kim <sbcrux.kim@samsung.com>
Mon, 2 Jul 2012 08:41:35 +0000 (17:41 +0900)
committerDima Zavin <dima@android.com>
Tue, 24 Jul 2012 22:12:40 +0000 (15:12 -0700)
remove tab & line.

Change-Id: I1486e8acf919657d4161b943f679bce3ffb5a90b
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
13 files changed:
exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.h
exynos_omx/openmax/exynos_omx/component/video/dec/h264/Exynos_OMX_H264dec.h
exynos_omx/openmax/exynos_omx/component/video/dec/h264/library_register.c
exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c
exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/library_register.h
exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Exynos_OMX_Vp8dec.h
exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c
exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_VencControl.c
exynos_omx/openmax/exynos_omx/component/video/enc/h264/library_register.c
exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_SharedMemory.c

index 61555e2e4de2219def35b9b8a0fbd5f17b4dd7b9..6fcc054c5ccf1407030ca822f233de1caf0c3ff8 100644 (file)
 #include "Exynos_OMX_Basecomponent.h"
 #include "ExynosVideoApi.h"
 
-#define MAX_VIDEO_INPUTBUFFER_NUM    5
-#define MAX_VIDEO_OUTPUTBUFFER_NUM   2
+#define MAX_VIDEO_INPUTBUFFER_NUM           5
+#define MAX_VIDEO_OUTPUTBUFFER_NUM          2
 
-#define DEFAULT_FRAME_WIDTH          176
-#define DEFAULT_FRAME_HEIGHT         144
+#define DEFAULT_FRAME_WIDTH                 176
+#define DEFAULT_FRAME_HEIGHT                144
 
 #define DEFAULT_VIDEO_INPUT_BUFFER_SIZE    (DEFAULT_FRAME_WIDTH * DEFAULT_FRAME_HEIGHT) * 2
 #define DEFAULT_VIDEO_OUTPUT_BUFFER_SIZE   (DEFAULT_FRAME_WIDTH * DEFAULT_FRAME_HEIGHT * 3) / 2
index 0092f88adeb1b273217a2107034f10dfb578a302..3e4f18f702fb84456fac8afee2e3fa42304f6aff 100644 (file)
 
 typedef struct _EXYNOS_MFC_H264DEC_HANDLE
 {
-    OMX_HANDLETYPE hMFCHandle;
-    OMX_U32  indexTimestamp;
-    OMX_U32  outputIndexTimestamp;
-    OMX_BOOL bConfiguredMFCSrc;
-    OMX_BOOL bConfiguredMFCDst;
-    OMX_U32  MAXDPBNum;
+    OMX_HANDLETYPE             hMFCHandle;
+    OMX_U32                    indexTimestamp;
+    OMX_U32                    outputIndexTimestamp;
+    OMX_BOOL                   bConfiguredMFCSrc;
+    OMX_BOOL                   bConfiguredMFCDst;
+    OMX_U32                    MAXDPBNum;
 
     ExynosVideoColorFormatType MFCOutputColorType;
-    ExynosVideoDecOps *pDecOps;
-    ExynosVideoDecBufferOps *pInbufOps;
-    ExynosVideoDecBufferOps *pOutbufOps;
-    ExynosVideoGeometry      codecOutbufConf;
+    ExynosVideoDecOps         *pDecOps;
+    ExynosVideoDecBufferOps   *pInbufOps;
+    ExynosVideoDecBufferOps   *pOutbufOps;
+    ExynosVideoGeometry        codecOutbufConf;
 } EXYNOS_MFC_H264DEC_HANDLE;
 
 typedef struct _EXYNOS_H264DEC_HANDLE
index b4b8743dce2871fe9f5dc673c3a877be877fff5c..dbee535387144dab280a0886fcf222b4552bbf40 100644 (file)
@@ -18,8 +18,8 @@
 /*
  * @file      Exynos_OMX_Mpeg4dec.c
  * @brief
- * @author    SeungBeom Kim (sbcrux.kim@samsung.com)
  * @author    Yunji Kim (yunji.kim@samsung.com)
+ * @author    SeungBeom Kim (sbcrux.kim@samsung.com)
  * @version   2.0.0
  * @history
  *   2012.02.20 : Create
index 1d24057e54499cef421b7395cf5589a98cd67da5..b5626306c6d2448f2397204c28df9185d4c2a38e 100644 (file)
@@ -18,8 +18,8 @@
 /*
  * @file        Exynos_OMX_Mpeg4dec.h
  * @brief
- * @author      SeungBeom Kim (sbcrux.kim@samsung.com)
  * @author      Yunji Kim (yunji.kim@samsung.com)
+ * @author      SeungBeom Kim (sbcrux.kim@samsung.com)
  * @version     2.0.0
  * @history
  *   2012.02.20 : Create
@@ -60,19 +60,19 @@ typedef struct _BitmapInfoHhr
 
 typedef struct _EXYNOS_MFC_MPEG4DEC_HANDLE
 {
-    OMX_HANDLETYPE hMFCHandle;
-    OMX_U32        indexTimestamp;
-    OMX_U32        outputIndexTimestamp;
-    OMX_BOOL       bConfiguredMFCSrc;
-    OMX_BOOL       bConfiguredMFCDst;
-    OMX_U32        MAXDPBNum;
-    CODEC_TYPE     codecType;
+    OMX_HANDLETYPE             hMFCHandle;
+    OMX_U32                    indexTimestamp;
+    OMX_U32                    outputIndexTimestamp;
+    OMX_BOOL                   bConfiguredMFCSrc;
+    OMX_BOOL                   bConfiguredMFCDst;
+    OMX_U32                    MAXDPBNum;
+    CODEC_TYPE                 codecType;
 
     ExynosVideoColorFormatType MFCOutputColorType;
-    ExynosVideoDecOps *pDecOps;
-    ExynosVideoDecBufferOps *pInbufOps;
-    ExynosVideoDecBufferOps *pOutbufOps;
-    ExynosVideoGeometry      codecOutbufConf;
+    ExynosVideoDecOps         *pDecOps;
+    ExynosVideoDecBufferOps   *pInbufOps;
+    ExynosVideoDecBufferOps   *pOutbufOps;
+    ExynosVideoGeometry        codecOutbufConf;
 } EXYNOS_MFC_MPEG4DEC_HANDLE;
 
 typedef struct _EXYNOS_MPEG4DEC_HANDLE
@@ -83,7 +83,7 @@ typedef struct _EXYNOS_MPEG4DEC_HANDLE
     OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE errorCorrectionType[ALL_PORT_NUM];
 
     /* EXYNOS MFC Codec specific */
-    EXYNOS_MFC_MPEG4DEC_HANDLE             hMFCMpeg4Handle;
+    EXYNOS_MFC_MPEG4DEC_HANDLE          hMFCMpeg4Handle;
 
     OMX_BOOL bSourceStart;
     OMX_BOOL bDestinationStart;
index 66c2828d3aa16d24280e1a44429e951d35305985..5af784024ad3b4ea8ce63abb371a1c2f9f124cd1 100644 (file)
@@ -33,7 +33,7 @@
 
 
 #define OSCL_EXPORT_REF __attribute__((visibility("default")))
-#define MAX_COMPONENT_NUM              2
+#define MAX_COMPONENT_NUM         2
 #define MAX_COMPONENT_ROLE_NUM    1
 
 /* MPEG4 */
@@ -57,4 +57,3 @@ OSCL_EXPORT_REF int Exynos_OMX_COMPONENT_Library_Register(
 #endif
 
 #endif
-
index 34139fef70792eb61df72a25256e76d002391618..d460710dcb06da3f7728a020fbbbfbbe10515631 100644 (file)
 
 typedef struct _EXYNOS_MFC_VP8DEC_HANDLE
 {
-    OMX_HANDLETYPE hMFCHandle;
-    OMX_U32  indexTimestamp;
-    OMX_U32  outputIndexTimestamp;
-    OMX_BOOL       bConfiguredMFCSrc;
-    OMX_BOOL       bConfiguredMFCDst;
-    OMX_U32        MAXDPBNum;
+    OMX_HANDLETYPE             hMFCHandle;
+    OMX_U32                    indexTimestamp;
+    OMX_U32                    outputIndexTimestamp;
+    OMX_BOOL                   bConfiguredMFCSrc;
+    OMX_BOOL                   bConfiguredMFCDst;
+    OMX_U32                    MAXDPBNum;
 
     ExynosVideoColorFormatType MFCOutputColorType;
-    ExynosVideoDecOps *pDecOps;
-    ExynosVideoDecBufferOps *pInbufOps;
-    ExynosVideoDecBufferOps *pOutbufOps;
-    ExynosVideoGeometry      codecOutbufConf;
+    ExynosVideoDecOps         *pDecOps;
+    ExynosVideoDecBufferOps   *pInbufOps;
+    ExynosVideoDecBufferOps   *pOutbufOps;
+    ExynosVideoGeometry        codecOutbufConf;
 } EXYNOS_MFC_VP8DEC_HANDLE;
 
 typedef struct _EXYNOS_VP8DEC_HANDLE
index 81890380d5d1f46666ef608cfc935481af644e23..e792b924ee9ece9feaf1d2debf7dc7b0b71c53c2 100644 (file)
@@ -75,7 +75,7 @@ inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
             exynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2;
     }
 
-  return ;
+    return;
 }
 
 OMX_BOOL Exynos_Check_BufferProcess_State(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_U32 nPortIndex)
@@ -678,7 +678,7 @@ OMX_ERRORTYPE Exynos_OMX_DstInputBufferProcess(OMX_HANDLETYPE hComponent)
                     ret = Exynos_OutputBufferGetQueue(pExynosComponent);
                     if (ret != OMX_ErrorNone) {
                         Exynos_OSAL_MutexUnlock(dstInputUseBuffer->bufferMutex);
-                       break;
+                        break;
                     }
                     Exynos_Shared_BufferToData(dstInputUseBuffer, &dstInputData, ONE_PLANE);
                     Exynos_ResetDataBuffer(dstInputUseBuffer);
index e7003e81030cd16c27e727b45e84629262054dac..fb98e3444dfdd90050d748fec83efef7963bb03c 100644 (file)
@@ -191,7 +191,7 @@ OMX_ERRORTYPE Exynos_OMX_AllocateBuffer(
     }
 
     if (pExynosPort->bufferProcessType == BUFFER_SHARE) {
-         temp_buffer = Exynos_OSAL_SharedMemory_Alloc(pVideoDec->hSharedMemory, nSizeBytes, NORMAL_MEMORY);
+        temp_buffer = Exynos_OSAL_SharedMemory_Alloc(pVideoDec->hSharedMemory, nSizeBytes, NORMAL_MEMORY);
         if (temp_buffer == NULL) {
             ret = OMX_ErrorInsufficientResources;
             goto EXIT;
@@ -566,7 +566,7 @@ OMX_ERRORTYPE Exynos_OMX_BufferFlush(OMX_COMPONENTTYPE *pOMXComponent, OMX_S32 n
         }
 
         pExynosComponent->pExynosPort[nPortIndex].bIsPortFlushed = OMX_FALSE;
-        Exynos_OSAL_Log(EXYNOS_LOG_TRACE,"OMX_CommandFlush EventCmdComplete, port:%d", pOMXComponent, nPortIndex);
+        Exynos_OSAL_Log(EXYNOS_LOG_TRACE,"OMX_CommandFlush EventCmdComplete, port:%d", nPortIndex);
         if (bEvent == OMX_TRUE)
             pExynosComponent->pCallbacks->EventHandler((OMX_HANDLETYPE)pOMXComponent,
                             pExynosComponent->callbackData,
@@ -1321,7 +1321,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoEncodeSetParameter(
                 goto EXIT;
             }
         }
-        if(pPortDefinition->nBufferCountActual < pExynosPort->portDefinition.nBufferCountMin) {
+        if (pPortDefinition->nBufferCountActual < pExynosPort->portDefinition.nBufferCountMin) {
             ret = OMX_ErrorBadParameter;
             goto EXIT;
         }
index 96717557a468a4f4c98b3dba5d76a5a7a0c69214..c8afbd6652f8a6aad534111cb6f76b9a3c335e7f 100644 (file)
 
 OSCL_EXPORT_REF int Exynos_OMX_COMPONENT_Library_Register(ExynosRegisterComponentType **exynosComponents)
 {
-       FunctionIn();
+    FunctionIn();
 
-       if (exynosComponents == NULL)
-               goto EXIT;
+    if (exynosComponents == NULL)
+        goto EXIT;
 
-       /* component 1 - video decoder H.264 */
-       Exynos_OSAL_Strcpy(exynosComponents[0]->componentName, EXYNOS_OMX_COMPONENT_H264_ENC);
-       Exynos_OSAL_Strcpy(exynosComponents[0]->roles[0], EXYNOS_OMX_COMPONENT_H264_ENC_ROLE);
-       exynosComponents[0]->totalRoleNum = MAX_COMPONENT_ROLE_NUM;
+    /* component 1 - video decoder H.264 */
+    Exynos_OSAL_Strcpy(exynosComponents[0]->componentName, EXYNOS_OMX_COMPONENT_H264_ENC);
+    Exynos_OSAL_Strcpy(exynosComponents[0]->roles[0], EXYNOS_OMX_COMPONENT_H264_ENC_ROLE);
+    exynosComponents[0]->totalRoleNum = MAX_COMPONENT_ROLE_NUM;
 
 EXIT:
-       FunctionOut();
+    FunctionOut();
 
-       return MAX_COMPONENT_NUM;
+    return MAX_COMPONENT_NUM;
 }
 
index c6210bcdf99bfa20a6672a09cbf36997b163b5ad..57bfc965863513d2469a6b4d096bb1b8a695e759 100644 (file)
@@ -482,7 +482,6 @@ static void Change_H263Enc_Param(EXYNOS_OMX_BASECOMPONENT *pExynosComponent)
     Set_H263Enc_Param(pExynosComponent);
 }
 
-
 OMX_ERRORTYPE GetCodecInputPrivateData(OMX_PTR codecBuffer, OMX_PTR addr[], OMX_U32 size[])
 {
     OMX_ERRORTYPE       ret = OMX_ErrorNone;
@@ -491,7 +490,6 @@ EXIT:
     return ret;
 }
 
-
 OMX_ERRORTYPE GetCodecOutputPrivateData(OMX_PTR codecBuffer, OMX_PTR *pVirtAddr, OMX_U32 *dataSize)
 {
     OMX_ERRORTYPE       ret = OMX_ErrorNone;
index 7fd3545325ebf71c781297f8b7eb18878aa0b07d..1c43b5c5c75d415fd444743fb26b3ce846f01f21 100644 (file)
@@ -176,7 +176,7 @@ EXIT:
     return ret;
 }
 
-static OMX_ERRORTYPE useAndroidNativeBuffer(
+OMX_ERRORTYPE useAndroidNativeBuffer(
     EXYNOS_OMX_BASEPORT      *pExynosPort,
     OMX_BUFFERHEADERTYPE **ppBufferHdr,
     OMX_U32                nPortIndex,
@@ -213,7 +213,6 @@ static OMX_ERRORTYPE useAndroidNativeBuffer(
     }
     Exynos_OSAL_Memset(temp_bufferHeader, 0, sizeof(OMX_BUFFERHEADERTYPE));
 
-
     for (i = 0; i < pExynosPort->portDefinition.nBufferCountActual; i++) {
         if (pExynosPort->bufferStateAllocate[i] == BUFFER_STATE_FREE) {
             pExynosPort->extendBufferHeader[i].OMXBufferHeader = temp_bufferHeader;
@@ -550,18 +549,18 @@ OMX_ERRORTYPE Exynos_OSAL_GetInfoFromMetaData(OMX_IN OMX_BYTE pBuffer,
     Exynos_OSAL_Memcpy(&type, (MetadataBufferType *)pBuffer, sizeof(MetadataBufferType));
 
     if (type == kMetadataBufferTypeCameraSource) {
-               void *pAddress = NULL;
+        void *pAddress = NULL;
 
         /* Address. of Y */
         Exynos_OSAL_Memcpy(&pAddress, pBuffer + sizeof(MetadataBufferType), sizeof(void *));
-               ppBuf[0] = (void *)pAddress;
+        ppBuf[0] = (void *)pAddress;
 
         /* Address. of CbCr */
         Exynos_OSAL_Memcpy(&pAddress, pBuffer + sizeof(MetadataBufferType) + sizeof(void *), sizeof(void *));
-               ppBuf[1] = (void *)pAddress;
+        ppBuf[1] = (void *)pAddress;
 
     } else if (type == kMetadataBufferTypeGrallocSource) {
-               buffer_handle_t    pBufHandle;
+        buffer_handle_t    pBufHandle;
 
         /* buffer_handle_t */
         Exynos_OSAL_Memcpy(&pBufHandle, pBuffer + sizeof(MetadataBufferType), sizeof(buffer_handle_t));
index da78d22d1d0aa960154b6fc15f00c8e9e7136845..2dbcd8f517fc806d6abea6e1a989f7141622fca0 100644 (file)
@@ -301,4 +301,3 @@ OMX_PTR Exynos_OSAL_SharedMemory_IONToVirt(OMX_HANDLETYPE handle, int ion_addr)
 EXIT:
     return pBuffer;
 }
-