diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-04 15:49:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 15:49:47 +0000 |
| commit | 971a5d8397fc28e6c0d0ddbe1dc5722d5112b1ae (patch) | |
| tree | 9b57415df519c4af667f1a40de10397b04c9e860 | |
| parent | 734df24b269acd2ff140f8617d61f021b3073566 (diff) | |
| parent | 1112f2fc374699af6ea7c40dc5e57f0bfd77c338 (diff) | |
| download | android_hardware_samsung_slsi_exynos5-971a5d8397fc28e6c0d0ddbe1dc5722d5112b1ae.tar.gz android_hardware_samsung_slsi_exynos5-971a5d8397fc28e6c0d0ddbe1dc5722d5112b1ae.tar.bz2 android_hardware_samsung_slsi_exynos5-971a5d8397fc28e6c0d0ddbe1dc5722d5112b1ae.zip | |
am 1112f2fc: Merge "exynos: vdec: support disabling metadata and native buffer modes" into lmp-mr1-dev
* commit '1112f2fc374699af6ea7c40dc5e57f0bfd77c338':
exynos: vdec: support disabling metadata and native buffer modes
| -rw-r--r-- | exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp index d4e24d3..b128aaf 100644 --- a/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp +++ b/exynos_omx/openmax/exynos_omx/osal/Exynos_OSAL_Android.cpp @@ -696,6 +696,12 @@ OMX_ERRORTYPE Exynos_OSAL_SetANBParameter( pExynosPort->bufferProcessType = BUFFER_SHARE; pExynosPort->portDefinition.format.video.eColorFormat = (OMX_COLOR_FORMATTYPE)OMX_SEC_COLOR_FormatNV12Tiled; Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "OMX_IndexParamEnableAndroidBuffers & bufferProcessType change to BUFFER_SHARE"); + } else if ((portIndex == OUTPUT_PORT_INDEX) && + (pExynosPort->bStoreMetaData == OMX_FALSE && pExynosPort->bIsANBEnabled == OMX_FALSE) && + pExynosPort->bufferProcessType == BUFFER_SHARE) { + pExynosPort->bufferProcessType = (EXYNOS_OMX_BUFFERPROCESS_TYPE)(BUFFER_COPY | BUFFER_ANBSHARE); + pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; + Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "No OMX_IndexParamEnableAndroidBuffers => reset bufferProcessType"); } } break; @@ -789,6 +795,12 @@ OMX_ERRORTYPE Exynos_OSAL_SetANBParameter( pExynosPort->bufferProcessType = BUFFER_SHARE; pExynosPort->portDefinition.format.video.eColorFormat = (OMX_COLOR_FORMATTYPE)OMX_SEC_COLOR_FormatNV12Tiled; Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "OMX_IndexParamStoreMetaDataBuffer & bufferProcessType change to BUFFER_SHARE"); + } else if ((portIndex == OUTPUT_PORT_INDEX) && + (pExynosPort->bStoreMetaData == OMX_FALSE && pExynosPort->bIsANBEnabled == OMX_FALSE) && + pExynosPort->bufferProcessType == BUFFER_SHARE) { + pExynosPort->bufferProcessType = (EXYNOS_OMX_BUFFERPROCESS_TYPE)(BUFFER_COPY | BUFFER_ANBSHARE); + pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; + Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "No OMX_IndexParamStoreMetaDataBuffer => reset bufferProcessType"); } } |