summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-02-06 00:08:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-06 00:08:34 +0000
commit3ce31a5b30c78a0ec2739889be6e8655e9568833 (patch)
tree3af3d3e11a1e9c8f619d81b4dc70e825ccf565d0
parent971a5d8397fc28e6c0d0ddbe1dc5722d5112b1ae (diff)
parent4baab539d5854f3270e6eb5a3d12e5be0fd8bdef (diff)
downloadexynos5-3ce31a5b30c78a0ec2739889be6e8655e9568833.tar.gz
am 4baab539: exynos: vdec: report width/height as stride/slice-height for BUFFER_COPY
* commit '4baab539d5854f3270e6eb5a3d12e5be0fd8bdef': exynos: vdec: report width/height as stride/slice-height for BUFFER_COPY
-rw-r--r--exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_VdecControl.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_VdecControl.c b/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_VdecControl.c
index 80c3b63..7d4b56b 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_VdecControl.c
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/Exynos_OMX_VdecControl.c
@@ -1123,6 +1123,15 @@ OMX_ERRORTYPE Exynos_OMX_VideoDecodeGetParameter(
(OMX_COLOR_FORMATTYPE)Exynos_OSAL_OMX2HalPixelFormat(portDefinition->format.video.eColorFormat);
Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "portDefinition->format.video.eColorFormat:0x%x", portDefinition->format.video.eColorFormat);
}
+
+ // WORKAROUND provided by Google engineer
+ if (portIndex == OUTPUT_PORT_INDEX &&
+ (pExynosPort->bufferProcessType & BUFFER_COPY) == BUFFER_COPY) {
+ // Decoder actually uses width and height as stride and slice height for buffer copy.
+ // Changing only at getParam as the internal value may be used elsewhere
+ portDefinition->format.video.nStride = portDefinition->format.video.nFrameWidth;
+ portDefinition->format.video.nSliceHeight = portDefinition->format.video.nFrameHeight;
+ }
}
break;
#endif