Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev
diff --git a/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Basecomponent.c b/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Basecomponent.c
index f9769ef..fac8d52 100644
--- a/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Basecomponent.c
+++ b/exynos_omx/openmax/exynos_omx/component/common/Exynos_OMX_Basecomponent.c
@@ -201,7 +201,7 @@
Exynos_OMX_Release_Resource(pOMXComponent);
}
- Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "destState: %d", destState);
+ Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "destState: %d currentState: %d", destState, currentState);
switch (destState) {
case OMX_StateInvalid:
switch (currentState) {
@@ -357,6 +357,8 @@
/*
* if (CHECK_PORT_TUNNELED == OMX_TRUE) thenTunnel Buffer Free
*/
+ Exynos_OSAL_SignalSet(pExynosComponent->abendStateEvent);
+ Exynos_OMX_Release_Resource(pOMXComponent);
goto EXIT;
}
if (pExynosComponent->bMultiThreadProcess == OMX_FALSE) {
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Exynos_OMX_H264enc.c b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Exynos_OMX_H264enc.c
index d17a934..0f8a275 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Exynos_OMX_H264enc.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Exynos_OMX_H264enc.c
@@ -362,7 +362,7 @@
setParam = pExynosOutputPort->portDefinition.format.video.nBitrate;
pEncOps->Set_BitRate(pH264Enc->hMFCH264Handle.hMFCHandle, setParam);
}
- if (pH264Param->FrameRate != (int)((pExynosOutputPort->portDefinition.format.video.xFramerate) >> 16)) {
+ if (pH264Param->FrameRate != (int)((pExynosInputPort->portDefinition.format.video.xFramerate) >> 16)) {
setParam = (pExynosInputPort->portDefinition.format.video.xFramerate) >> 16;
pEncOps->Set_FrameRate(pH264Enc->hMFCH264Handle.hMFCHandle, setParam);
}
@@ -1745,6 +1745,10 @@
ret = H264CodecDstSetup(pOMXComponent);
}
+ if (pVideoEnc->configChange == OMX_TRUE) {
+ Change_H264Enc_Param(pExynosComponent);
+ pVideoEnc->configChange = OMX_FALSE;
+ }
if ((pSrcInputData->dataLen >= 0) ||
((pSrcInputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
OMX_U32 nAllocLen[MFC_INPUT_BUFFER_PLANE] = {0, 0};
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
index 3174dea..4884a81 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c
@@ -437,7 +437,7 @@
setParam = pExynosOutputPort->portDefinition.format.video.nBitrate;
pEncOps->Set_BitRate(pMpeg4Enc->hMFCMpeg4Handle.hMFCHandle, setParam);
}
- if (pMpeg4Param->TimeIncreamentRes != (int)((pExynosOutputPort->portDefinition.format.video.xFramerate) >> 16)) {
+ if (pMpeg4Param->TimeIncreamentRes != (int)((pExynosInputPort->portDefinition.format.video.xFramerate) >> 16)) {
setParam = (pExynosInputPort->portDefinition.format.video.xFramerate) >> 16;
pEncOps->Set_FrameRate(pMpeg4Enc->hMFCMpeg4Handle.hMFCHandle, setParam);
}
@@ -484,7 +484,7 @@
setParam = pExynosOutputPort->portDefinition.format.video.nBitrate;
pEncOps->Set_BitRate(pMpeg4Enc->hMFCMpeg4Handle.hMFCHandle, setParam);
}
- if (pH263Param->FrameRate != (int)((pExynosOutputPort->portDefinition.format.video.xFramerate) >> 16)) {
+ if (pH263Param->FrameRate != (int)((pExynosInputPort->portDefinition.format.video.xFramerate) >> 16)) {
setParam = (pExynosInputPort->portDefinition.format.video.xFramerate) >> 16;
pEncOps->Set_FrameRate(pMpeg4Enc->hMFCMpeg4Handle.hMFCHandle, setParam);
}
@@ -1955,6 +1955,13 @@
ret = Mpeg4CodecDstSetup(pOMXComponent);
}
+ if (pVideoEnc->configChange == OMX_TRUE) {
+ if (pMpeg4Enc->hMFCMpeg4Handle.codecType == CODEC_TYPE_MPEG4)
+ Change_Mpeg4Enc_Param(pExynosComponent);
+ else
+ Change_H263Enc_Param(pExynosComponent);
+ pVideoEnc->configChange = OMX_FALSE;
+ }
if ((pSrcInputData->dataLen >= 0) ||
((pSrcInputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
OMX_U32 nAllocLen[MFC_INPUT_BUFFER_PLANE] = {0, 0};
