summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-01-18 06:25:43 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-18 06:25:43 -0800
commitdfe2fe357a50beb6041122dadbbbdccf62a63724 (patch)
tree9e54215682b27a00706a8532f6c2e0da4d5bf434
parentc40cf77ecef4568682698ee7538043ab024ab0b3 (diff)
parent41a5cfdaa12588e459df14050e8f06c803812a76 (diff)
downloadandroid_hardware_qcom_media-dfe2fe357a50beb6041122dadbbbdccf62a63724.tar.gz
android_hardware_qcom_media-dfe2fe357a50beb6041122dadbbbdccf62a63724.tar.bz2
android_hardware_qcom_media-dfe2fe357a50beb6041122dadbbbdccf62a63724.zip
Merge "mm-video: Adjust stride value for planar format"
-rw-r--r--mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index dbd155ab..d0d108a2 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -9081,11 +9081,14 @@ OMX_ERRORTYPE omx_vdec::update_portdef(OMX_PARAM_PORTDEFINITIONTYPE *portDefn)
portDefn->format.video.nSliceHeight = drv_ctx.video_resolution.scan_lines;
}
- if ((portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420Planar) ||
- (portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar)) {
+ if (portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420Planar) {
+ portDefn->format.video.nStride = drv_ctx.video_resolution.frame_width;
+ portDefn->format.video.nSliceHeight = drv_ctx.video_resolution.frame_height;
+ } else if (portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {
portDefn->format.video.nStride = ALIGN(drv_ctx.video_resolution.frame_width, 16);
portDefn->format.video.nSliceHeight = drv_ctx.video_resolution.frame_height;
}
+
DEBUG_PRINT_HIGH("update_portdef(%u): Width = %u Height = %u Stride = %d "
"SliceHeight = %u eColorFormat = %d nBufSize %u nBufCnt %u",
(unsigned int)portDefn->nPortIndex,