diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-22 13:57:42 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-23 08:27:36 -0700 |
| commit | 1f1f957cc6768d24b09fd96f76aaec3884e1623e (patch) | |
| tree | c99f0de2fb789bc92c72001a5be1b6d6c0a8c895 /domx | |
| parent | b83122f8b520028ec6d24215c47ab0c6cf76accf (diff) | |
| download | hardware_ti_omap4xxx-1f1f957cc6768d24b09fd96f76aaec3884e1623e.zip hardware_ti_omap4xxx-1f1f957cc6768d24b09fd96f76aaec3884e1623e.tar.gz hardware_ti_omap4xxx-1f1f957cc6768d24b09fd96f76aaec3884e1623e.tar.bz2 | |
omap4xxx: tiler/camera cleanup
Change-Id: Ia63104950fdfbaf41254187dd0ee516fde8eb7d2
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'domx')
| -rw-r--r-- | domx/domx/omx_proxy_common/src/omx_proxy_common.c | 14 | ||||
| -rwxr-xr-x | domx/omx_proxy_component/omx_camera/src/omx_proxy_camera.c | 2 |
2 files changed, 8 insertions, 8 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 a72c462..9230bf3 100644 --- a/domx/domx/omx_proxy_common/src/omx_proxy_common.c +++ b/domx/domx/omx_proxy_common/src/omx_proxy_common.c @@ -634,12 +634,12 @@ static OMX_ERRORTYPE PROXY_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, eError = PROXY_GetParameter(hComponent, (OMX_INDEXTYPE)OMX_TI_IndexParam2DBufferAllocDimension, &tParamRect); if(eError == OMX_ErrorNone) { - blocks[0].pixelFormat = PIXEL_FMT_8BIT; + blocks[0].fmt = PIXEL_FMT_8BIT; blocks[0].dim.area.width = tParamRect.nWidth; blocks[0].dim.area.height = tParamRect.nHeight; blocks[0].stride = 0; - blocks[1].pixelFormat = PIXEL_FMT_16BIT; + blocks[1].fmt = PIXEL_FMT_16BIT; blocks[1].dim.area.width = tParamRect.nWidth >> 1; blocks[1].dim.area.height = tParamRect.nHeight >> 1; blocks[1].stride = 0; @@ -662,12 +662,12 @@ static OMX_ERRORTYPE PROXY_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, return eError; } - blocks[0].pixelFormat = PIXEL_FMT_8BIT; + blocks[0].fmt = PIXEL_FMT_8BIT; blocks[0].dim.area.width = tParamPortDef.format.video.nFrameWidth; blocks[0].dim.area.height = tParamPortDef.format.video.nFrameHeight; blocks[0].stride = 0; - blocks[1].pixelFormat = PIXEL_FMT_16BIT; + blocks[1].fmt = PIXEL_FMT_16BIT; blocks[1].dim.area.width = tParamPortDef.format.video.nFrameWidth >> 1; blocks[1].dim.area.height = tParamPortDef.format.video.nFrameHeight >> 1; blocks[1].stride = 0; @@ -686,7 +686,7 @@ static OMX_ERRORTYPE PROXY_AllocateBuffer(OMX_IN OMX_HANDLETYPE hComponent, } else //Allocate 1D buffer { - block.pixelFormat = PIXEL_FMT_PAGE; + block.fmt = PIXEL_FMT_PAGE; block.dim.len = nSize; block.stride = 0; @@ -966,7 +966,7 @@ static OMX_ERRORTYPE PROXY_UseBuffer(OMX_IN OMX_HANDLETYPE hComponent, if(tMetaDataBuffer.bIsMetaDataEnabledOnPort) { - block.pixelFormat = PIXEL_FMT_PAGE; + block.fmt = PIXEL_FMT_PAGE; block.dim.len = tMetaDataBuffer.nMetaDataSize; ((OMX_TI_PLATFORMPRIVATE *)pBufferHeader-> pPlatformPrivate)->pMetaDataBuffer = MemMgr_Alloc(&block, 1); @@ -2240,7 +2240,7 @@ OMX_ERRORTYPE RPC_MapBuffer_Ducati(OMX_U8 * pBuf, OMX_U32 nBufLineSize, { DOMX_DEBUG ("Buffer is not mapped: Mapping as 1D buffer now.."); - block.pixelFormat = PIXEL_FMT_PAGE; + block.fmt = PIXEL_FMT_PAGE; block.ptr = (OMX_PTR) (((OMX_U32) pBuf / LINUX_PAGE_SIZE) * LINUX_PAGE_SIZE); block.dim.len = (OMX_U32) ((((OMX_U32) pBuf + nBufLineSize + 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 087bd47..fb1a7de 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 @@ -425,7 +425,7 @@ OMX_ERRORTYPE DCC_Init(OMX_HANDLETYPE hComponent) OMX_ErrorInsufficientResources, "Malloc failed"); /* Allocate 1D Tiler buffer for 'N'DCC files */ - MemReqDescTiler[0].pixelFormat = PIXEL_FMT_PAGE; + MemReqDescTiler[0].fmt = PIXEL_FMT_PAGE; MemReqDescTiler[0].dim.len = dccbuf_size; MemReqDescTiler[0].stride = 0; TilerAddr = MemMgr_Alloc(MemReqDescTiler, 1); |