diff options
| author | Sunita Nadampalli <sunitan@ti.com> | 2015-05-13 15:22:52 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@DLEZVX23.itg.ti.com> | 2015-05-14 13:27:02 -0500 |
| commit | cd94ea69c14551d40294bda9a00929c23de8fba5 (patch) | |
| tree | c7d61c08ec2051e4c3f507d4fbea39982f2915b1 | |
| parent | 597fc10865e4222ef91aeef327caf8dedb1034b0 (diff) | |
| download | dra7xx-cd94ea69c14551d40294bda9a00929c23de8fba5.tar.gz | |
omx: Video encoder changes to incorporate generic NV12 format definition
Starting with DRM based Video components, all the NV12
buffers are handled in a generic way, and no support for
TILER-2D container buffers. This patch corrects the
format definition as per new definition in hal_public.h
Change-Id: Icf3fd56af18565ea15fb872183fc6bb379482353
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
| -rw-r--r-- | omx/videoencode/omx_h264_enc/src/omx_H264videoencoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/omx/videoencode/omx_h264_enc/src/omx_H264videoencoder.c b/omx/videoencode/omx_h264_enc/src/omx_H264videoencoder.c index de7f375..c73b6dc 100644 --- a/omx/videoencode/omx_h264_enc/src/omx_H264videoencoder.c +++ b/omx/videoencode/omx_h264_enc/src/omx_H264videoencoder.c @@ -73,7 +73,7 @@ int COLORCONVERT_PlatformOpaqueToNV12(void *hCC, int nErr = -1; if((nSrcBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE) && (nDstBufType == COLORCONVERT_BUFTYPE_VIRTUAL)) { - nErr = module->Blit(module, pSrc[0], pDst, HAL_PIXEL_FORMAT_TI_NV12); + nErr = module->Blit(module, pSrc[0], pDst, HAL_PIXEL_FORMAT_NV12); } else if((nSrcBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE) && (nDstBufType == COLORCONVERT_BUFTYPE_GRALLOCOPAQUE )) { nErr = module->Blit2(module, pSrc[0], pDst[0], nWidth, nHeight, 0, 0); } @@ -1733,7 +1733,7 @@ static OMX_ERRORTYPE OMXH264VE_DataNotify(OMX_HANDLETYPE hComponent) pTempBuffer++; tBufHandle = *((buffer_handle_t *)pTempBuffer); pGrallocHandle = (IMG_native_handle_t*) tBufHandle; - if (pGrallocHandle->iFormat != HAL_PIXEL_FORMAT_TI_NV12) { + if (pGrallocHandle->iFormat != HAL_PIXEL_FORMAT_NV12) { if (pH264VEComp->pBackupBuffers == NULL) { /* Open gralloc allocator and allocate the backup buffers */ gralloc_open(pH264VEComp->hCC, &(pH264VEComp->mAllocDev)); @@ -1748,7 +1748,7 @@ static OMX_ERRORTYPE OMXH264VE_DataNotify(OMX_HANDLETYPE hComponent) int err = pH264VEComp->mAllocDev->alloc(pH264VEComp->mAllocDev, (int) pH264VEComp->sBase.pPorts[OMX_H264VE_INPUT_PORT]->sPortDef.format.video.nFrameWidth, (int) pH264VEComp->sBase.pPorts[OMX_H264VE_INPUT_PORT]->sPortDef.format.video.nFrameHeight, - (int) HAL_PIXEL_FORMAT_TI_NV12, (int) GRALLOC_USAGE_HW_RENDER, + (int) HAL_PIXEL_FORMAT_NV12, (int) GRALLOC_USAGE_HW_RENDER, (const struct native_handle_t * *)(&(pH264VEComp->pBackupBuffers[j])), (int *) &stride); OMX_CHECK(err == 0, err); |