diff options
| -rwxr-xr-x | exynos/libvideocodec/enc/ExynosVideoEncoder.c | 2 | ||||
| -rwxr-xr-x | openmax/component/video/dec/Exynos_OMX_VdecControl.c | 3 | ||||
| -rwxr-xr-x | openmax/component/video/enc/Exynos_OMX_VencControl.c | 2 | ||||
| -rwxr-xr-x | openmax/osal/Exynos_OSAL_SharedMemory.c | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/exynos/libvideocodec/enc/ExynosVideoEncoder.c b/exynos/libvideocodec/enc/ExynosVideoEncoder.c index 63d1a89..19c9d0d 100755 --- a/exynos/libvideocodec/enc/ExynosVideoEncoder.c +++ b/exynos/libvideocodec/enc/ExynosVideoEncoder.c @@ -98,12 +98,14 @@ static void __Set_SupportFormat(ExynosVideoInstInfo *pVideoInstInfo) case MFC_723: /* NV12, NV21, BGRA, RGBA, I420, YV12, ARGB, NV12T */ pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_BGRA8888; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_RGBA8888; + break; case MFC_72: /* NV12, NV21, I420, YV12, ARGB, NV12T */ case MFC_77: pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_I420; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_I420M; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_YV12M; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_ARGB8888; + break; case MFC_78: /* NV12, NV21, NV12T */ case MFC_65: case MFC_61: diff --git a/openmax/component/video/dec/Exynos_OMX_VdecControl.c b/openmax/component/video/dec/Exynos_OMX_VdecControl.c index b682638..e598a1c 100755 --- a/openmax/component/video/dec/Exynos_OMX_VdecControl.c +++ b/openmax/component/video/dec/Exynos_OMX_VdecControl.c @@ -1016,7 +1016,7 @@ EXIT: OMX_ERRORTYPE Exynos_InputBufferGetQueue(EXYNOS_OMX_BASECOMPONENT *pExynosComponent) { OMX_ERRORTYPE ret = OMX_ErrorUndefined; - EXYNOS_OMX_VIDEODEC_COMPONENT *pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle; + EXYNOS_OMX_VIDEODEC_COMPONENT *pVideoDec = NULL; EXYNOS_OMX_BASEPORT *pExynosPort = NULL; EXYNOS_OMX_MESSAGE *message = NULL; EXYNOS_OMX_DATABUFFER *inputUseBuffer = NULL; @@ -1028,6 +1028,7 @@ OMX_ERRORTYPE Exynos_InputBufferGetQueue(EXYNOS_OMX_BASECOMPONENT *pExynosCompon goto EXIT; } + pVideoDec = (EXYNOS_OMX_VIDEODEC_COMPONENT *)pExynosComponent->hComponentHandle; pExynosPort = &pExynosComponent->pExynosPort[INPUT_PORT_INDEX]; inputUseBuffer = &(pExynosPort->way.port2WayDataBuffer.inputDataBuffer); diff --git a/openmax/component/video/enc/Exynos_OMX_VencControl.c b/openmax/component/video/enc/Exynos_OMX_VencControl.c index 8e9cd5c..e8846f4 100755 --- a/openmax/component/video/enc/Exynos_OMX_VencControl.c +++ b/openmax/component/video/enc/Exynos_OMX_VencControl.c @@ -540,7 +540,7 @@ OMX_ERRORTYPE Exynos_OMX_FlushPort( OMX_S32 nPortIndex) { OMX_ERRORTYPE ret = OMX_ErrorNone; - EXYNOS_OMX_BASECOMPONENT *pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate; + EXYNOS_OMX_BASECOMPONENT *pExynosComponent = NULL; EXYNOS_OMX_BASEPORT *pExynosPort = NULL; OMX_BUFFERHEADERTYPE *pBufferHdr = NULL; EXYNOS_OMX_DATABUFFER *pDataBuffer[2] = {NULL, NULL}; diff --git a/openmax/osal/Exynos_OSAL_SharedMemory.c b/openmax/osal/Exynos_OSAL_SharedMemory.c index 4bcaa81..21e83e1 100755 --- a/openmax/osal/Exynos_OSAL_SharedMemory.c +++ b/openmax/osal/Exynos_OSAL_SharedMemory.c @@ -75,7 +75,7 @@ typedef struct _EXYNOS_SHARED_MEMORY OMX_HANDLETYPE Exynos_OSAL_SharedMemory_Open() { EXYNOS_SHARED_MEMORY *pHandle = NULL; - unsigned long IONClient = 0; + int IONClient = 0; pHandle = (EXYNOS_SHARED_MEMORY *)Exynos_OSAL_Malloc(sizeof(EXYNOS_SHARED_MEMORY)); if (pHandle == NULL) @@ -93,7 +93,7 @@ OMX_HANDLETYPE Exynos_OSAL_SharedMemory_Open() pHandle = NULL; goto EXIT; } - pHandle->hIONHandle = IONClient; + pHandle->hIONHandle = (unsigned long)IONClient; if (OMX_ErrorNone != Exynos_OSAL_MutexCreate(&pHandle->hSMMutex)) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "[%s] Failed to Exynos_OSAL_MutexCreate", __FUNCTION__); |