summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camera/inc/CameraHal.h4
-rw-r--r--domx/domx/omx_proxy_common/src/omx_proxy_common.c2
-rwxr-xr-xdomx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c18
-rw-r--r--domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c4
4 files changed, 17 insertions, 11 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index 2ee35f2..2506b7b 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -267,8 +267,8 @@ class CameraFrame
mFrameMask(0),
mQuirks(0) {
- mYuv[0] = NULL;
- mYuv[1] = NULL;
+ mYuv[0] = 0; //NULL;
+ mYuv[1] = 0; //NULL;
}
//copy constructor
diff --git a/domx/domx/omx_proxy_common/src/omx_proxy_common.c b/domx/domx/omx_proxy_common/src/omx_proxy_common.c
index fb91d31..b1df157 100644
--- a/domx/domx/omx_proxy_common/src/omx_proxy_common.c
+++ b/domx/domx/omx_proxy_common/src/omx_proxy_common.c
@@ -917,7 +917,7 @@ static OMX_ERRORTYPE PROXY_UseBuffer(OMX_IN OMX_HANDLETYPE hComponent,
OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *) hComponent;
OMX_BOOL bSlotFound = OMX_FALSE;
OMX_PTR pAuxBuf0 = pBuffer;
- OMX_PTR pMappedMetaDataBuffer = NULL;
+ //OMX_PTR pMappedMetaDataBuffer = NULL;
OMX_TI_PARAM_METADATABUFFERINFO tMetaDataBuffer;
OMX_U32 nBufferHeight = 0;
OMX_CONFIG_RECTTYPE tParamRect;
diff --git a/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c b/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c
index ce0af09..0afb95e 100755
--- a/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c
+++ b/domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c
@@ -114,8 +114,10 @@ OMX_PTR gCamIonHdl[MAX_NUM_INTERNAL_BUFFERS][2];
/* Tiler heap resservation specific */
#define OMAP_ION_HEAP_TILER_ALLOCATION_MASK (1<<4)
+#ifndef OMAP_TUNA
/* store handles for tracking and freeing */
OMX_PTR gComponentBufferAllocation[PROXY_MAXNUMOFPORTS][MAX_NUM_INTERNAL_BUFFERS];
+#endif
/* Incase of multiple instance, making sure DCC is initialized only for
first instance */
@@ -189,7 +191,6 @@ static OMX_ERRORTYPE ComponentPrivateDeInit(OMX_IN OMX_HANDLETYPE hComponent)
gCamIonHdl[i][1] = NULL;
}
}
-#endif
for (i = 0; i < PROXY_MAXNUMOFPORTS; i++) {
for (j = 0; j < MAX_NUM_INTERNAL_BUFFERS; j++) {
@@ -199,6 +200,7 @@ static OMX_ERRORTYPE ComponentPrivateDeInit(OMX_IN OMX_HANDLETYPE hComponent)
gComponentBufferAllocation[i][j] = NULL;
}
}
+#endif
eError = PROXY_ComponentDeInit(hComponent);
@@ -246,7 +248,9 @@ static OMX_ERRORTYPE Camera_SendCommand(OMX_IN OMX_HANDLETYPE hComponent,
}
dcc_loaded = OMX_TRUE;
}
- } else if (eCmd == OMX_CommandPortDisable) {
+ }
+#ifndef OMAP_TUNA
+ else if (eCmd == OMX_CommandPortDisable) {
int i, j;
for (i = 0; i < MAX_NUM_INTERNAL_BUFFERS; i++) {
for (j = 0; j < PROXY_MAXNUMOFPORTS; j++) {
@@ -258,9 +262,8 @@ static OMX_ERRORTYPE Camera_SendCommand(OMX_IN OMX_HANDLETYPE hComponent,
}
}
}
-
}
-
+#endif
eError =
PROXY_SendCommand(hComponent,eCmd,nParam,pCmdData);
@@ -400,11 +403,12 @@ static OMX_ERRORTYPE CameraSetParam(OMX_IN OMX_HANDLETYPE
OMX_INOUT OMX_PTR pComponentParameterStructure)
{
OMX_ERRORTYPE eError = OMX_ErrorNone;
+ OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *)hComponent;
+#ifndef OMAP_TUNA
struct ion_handle *handle;
OMX_U32 i =0;
OMX_S32 ret = 0;
PROXY_COMPONENT_PRIVATE *pCompPrv;
- OMX_COMPONENTTYPE *hComp = (OMX_COMPONENTTYPE *)hComponent;
OMX_U32 stride_Y = 0, stride_UV = 0;
#ifndef OMAP_TUNA
OMX_TI_PARAM_VTCSLICE *pVtcConfig;// = (OMX_TI_PARAM_VTCSLICE *)pComponentParameterStructure;
@@ -516,6 +520,7 @@ static OMX_ERRORTYPE CameraSetParam(OMX_IN OMX_HANDLETYPE
default:
break;
}
+#endif
eError = __PROXY_SetParameter(hComponent,
nParamIndex,
pComponentParameterStructure,
@@ -576,14 +581,13 @@ OMX_ERRORTYPE OMX_ComponentInit(OMX_HANDLETYPE hComponent)
gCamIonHdl[i][0] = NULL;
gCamIonHdl[i][1] = NULL;
}
-#endif
for (i = 0; i < PROXY_MAXNUMOFPORTS; i++) {
for (j = 0; j < MAX_NUM_INTERNAL_BUFFERS; j++) {
gComponentBufferAllocation[i][j] = NULL;
}
}
-
+#endif
pHandle->ComponentDeInit = ComponentPrivateDeInit;
pHandle->GetConfig = CameraGetConfig;
pHandle->SetConfig = CameraSetConfig;
diff --git a/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c b/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c
index 7a20bcb..21cc417 100644
--- a/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c
+++ b/domx/omx_proxy_component/omx_h264_enc/src/omx_proxy_h264enc.c
@@ -120,7 +120,9 @@ OMX_U16 nBFrames = 0; /* Number of B Frames in H264 Encoder */
* ANDROID_QUIRCK_CHANGE_PORT_VALUES
*/
#define OMX_H264VE_NUM_INTERNAL_BUF (8)
+#ifndef HAL_PIXEL_FORMAT_TI_NV12
#define HAL_PIXEL_FORMAT_TI_NV12 (0x100)
+#endif
#define COLORCONVERT_MAX_SUB_BUFFERS (3)
@@ -700,7 +702,7 @@ OMX_ERRORTYPE LOCAL_PROXY_H264E_EmptyThisBuffer(OMX_HANDLETYPE hComponent,
OMX_PTR pBufferOrig = NULL;
OMX_U32 nStride = 0, nNumLines = 0;
OMX_PARAM_PORTDEFINITIONTYPE tParamStruct;
- OMX_U32 nFilledLen, nAllocLen;
+ OMX_U32 nFilledLen = 0, nAllocLen = 0;
#ifdef ANDROID_CUSTOM_OPAQUECOLORFORMAT
OMX_PROXY_H264E_PRIVATE *pProxy = NULL;
TIMM_OSAL_ERRORTYPE eOSALStatus = TIMM_OSAL_ERR_NONE;