diff options
| author | Sundar Raman <sunds@ti.com> | 2011-08-29 16:30:34 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-30 09:36:21 -0700 |
| commit | 73bfc819486d5f632fd113996e6ecdbd647d2085 (patch) | |
| tree | 753ffd2dfaf93ad2149d951d52ed65612f222da5 /domx | |
| parent | 5950d86f5e3d119cb024ae3989a643571dd81794 (diff) | |
| download | hardware_ti_omap4xxx-73bfc819486d5f632fd113996e6ecdbd647d2085.zip hardware_ti_omap4xxx-73bfc819486d5f632fd113996e6ecdbd647d2085.tar.gz hardware_ti_omap4xxx-73bfc819486d5f632fd113996e6ecdbd647d2085.tar.bz2 | |
Remove some non fatal error logs in Camera use-case
Change-Id: I3d0f40b68c2337e67271784c544db8979dcc0358
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'domx')
| -rw-r--r-- | domx/domx/omx_proxy_common/src/omx_proxy_common.c | 10 | ||||
| -rwxr-xr-x | domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c | 7 |
2 files changed, 10 insertions, 7 deletions
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 e2e36f2..e00a2d2 100644 --- a/domx/domx/omx_proxy_common/src/omx_proxy_common.c +++ b/domx/domx/omx_proxy_common/src/omx_proxy_common.c @@ -149,7 +149,7 @@ char Core_Array[][MAX_CORENAME_LENGTH] = { \ DOMX_DEBUG("Corresponding RPC function executed successfully"); \ eError = eCompReturn; \ - PROXY_assert(eError == OMX_ErrorNone, eError, "Error returned from OMX API in ducati"); \ + PROXY_assert((eError == OMX_ErrorNone) || (eError == OMX_ErrorNoMore), eError, "Error returned from OMX API in ducati"); \ } else \ { \ DOMX_ERROR("RPC function returned error 0x%x", eRPCError); \ @@ -178,7 +178,7 @@ char Core_Array[][MAX_CORENAME_LENGTH] = #ifdef USE_ION -RPC_OMX_ERRORTYPE RPC_RegisterBuffer(OMX_HANDLETYPE hRPCCtx, int fd, +RPC_OMX_ERRORTYPE RPC_RegisterBuffer(OMX_HANDLETYPE hRPCCtx, int fd, struct ion_handle **handle) { int status; @@ -193,7 +193,7 @@ RPC_OMX_ERRORTYPE RPC_RegisterBuffer(OMX_HANDLETYPE hRPCCtx, int fd, return RPC_OMX_ErrorNone; } -static OMX_ERRORTYPE PROXY_AllocateBufferIonCarveout(PROXY_COMPONENT_PRIVATE *pCompPrv, +static OMX_ERRORTYPE PROXY_AllocateBufferIonCarveout(PROXY_COMPONENT_PRIVATE *pCompPrv, size_t len, struct ion_handle **handle) { int fd; @@ -204,7 +204,7 @@ static OMX_ERRORTYPE PROXY_AllocateBufferIonCarveout(PROXY_COMPONENT_PRIVATE *pC DOMX_DEBUG("ION being USED for allocation!!!!! handle = %x, ret =%x",temp,ret); if (ret) return OMX_ErrorInsufficientResources; - /* + /* ret = ion_share(pCompPrv->ion_fd, temp, &fd); if (ret) { ion_free(pCompPrv->ion_fd, temp); @@ -2015,7 +2015,7 @@ OMX_ERRORTYPE OMX_ProxyCommonInit(OMX_HANDLETYPE hComponent) pCompPrv->ion_fd = ion_open(); if(pCompPrv->ion_fd == 0) - { + { DOMX_ERROR("ion_open failed!!!"); return OMX_ErrorInsufficientResources; } 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 b29c5f4..db138ec 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 @@ -415,8 +415,11 @@ OMX_ERRORTYPE DCC_Init(OMX_HANDLETYPE hComponent) dccbuf_size = read_DCCdir(NULL, dcc_dir, nIndex); - PROXY_assert(dccbuf_size > 0, OMX_ErrorInsufficientResources, - "No DCC files found, switching back to default DCC"); + if(dccbuf_size <= 0) + { + DOMX_DEBUG("No DCC files found, switching back to default DCC"); + return OMX_ErrorInsufficientResources; + } MemReqDescTiler = (MemAllocBlock *) TIMM_OSAL_Malloc((sizeof(MemAllocBlock) * 2), |