From: SeungBeom Kim <sbcrux.kim@samsung.com>
Date: Mon, 2 Jul 2012 08:41:35 +0000 (+0900)
Subject: exynos_omx: multi_thread: Code clean-up.
X-Git-Tag: cm-10.1-M1~311
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d03573a4a182b0a36eaa16fb7638d98429d1c3fb;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos5.git
exynos_omx: multi_thread: Code clean-up.
remove tab & line.
Change-Id: I1486e8acf919657d4161b943f679bce3ffb5a90b
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
---
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.h b/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.h
index 61555e2..6fcc054 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.h
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_Vdec.h
@@ -36,11 +36,11 @@
#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
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Exynos_OMX_H264dec.h b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Exynos_OMX_H264dec.h
index 0092f88..3e4f18f 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Exynos_OMX_H264dec.h
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Exynos_OMX_H264dec.h
@@ -34,18 +34,18 @@
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
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/library_register.c b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/library_register.c
index 9a5e324..7fe26e8 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/library_register.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/library_register.c
@@ -57,4 +57,3 @@ EXIT:
return MAX_COMPONENT_NUM;
}
-
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c
index b4b8743..dbee535 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c
@@ -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
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
index 1d24057..b562630 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
@@ -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;
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/library_register.h b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/library_register.h
index 66c2828..5af7840 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/library_register.h
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/library_register.h
@@ -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
-
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Exynos_OMX_Vp8dec.h b/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Exynos_OMX_Vp8dec.h
index 34139fe..d460710 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Exynos_OMX_Vp8dec.h
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Exynos_OMX_Vp8dec.h
@@ -36,18 +36,18 @@
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
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c b/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c
index 8189038..e792b92 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_Venc.c
@@ -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);
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_VencControl.c b/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_VencControl.c
index e7003e8..fb98e34 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_VencControl.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/Exynos_OMX_VencControl.c
@@ -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;
}
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/library_register.c b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/library_register.c
index 9671755..c8afbd6 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/library_register.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/library_register.c
@@ -37,19 +37,19 @@
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;
}
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
index c6210bc..57bfc96 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
@@ -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;
diff --git a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
index 7fd3545..1c43b5c 100644
--- a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
+++ b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp
@@ -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));
diff --git a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_SharedMemory.c b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_SharedMemory.c
index da78d22..2dbcd8f 100644
--- a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_SharedMemory.c
+++ b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_SharedMemory.c
@@ -301,4 +301,3 @@ OMX_PTR Exynos_OSAL_SharedMemory_IONToVirt(OMX_HANDLETYPE handle, int ion_addr)
EXIT:
return pBuffer;
}
-