summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-05-20 00:06:55 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-05-20 00:06:55 -0700
commit090ea0de0e635c5c0f2f6bd00d6027c810cfe6c3 (patch)
tree7cafaf957172a52ae2e5feaf60b215ec4b6b9a07
parent85372cdd0ee39e4359a0949240863268a77e7f95 (diff)
parent45e85307f5c800b7684c33926833a004b39b253a (diff)
downloadandroid_hardware_qcom_media-090ea0de0e635c5c0f2f6bd00d6027c810cfe6c3.tar.gz
android_hardware_qcom_media-090ea0de0e635c5c0f2f6bd00d6027c810cfe6c3.tar.bz2
android_hardware_qcom_media-090ea0de0e635c5c0f2f6bd00d6027c810cfe6c3.zip
Merge "mm-video-v4l2: Pass stride and scanlines with reconfig event"
-rw-r--r--mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
index 9b282d01..ed9fe25b 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
@@ -1711,11 +1711,18 @@ void omx_vdec::process_event_cb(void *ctxt, unsigned char id)
}
if (pThis->m_cb.EventHandler) {
- uint32_t frame_data[2];
+ uint32_t frame_data[4];
frame_data[0] = (p2 == OMX_IndexParamPortDefinition) ?
pThis->m_reconfig_height : pThis->rectangle.nHeight;
frame_data[1] = (p2 == OMX_IndexParamPortDefinition) ?
pThis->m_reconfig_width : pThis->rectangle.nWidth;
+
+ frame_data[2] = (p2 == OMX_IndexParamPortDefinition) ?
+ frame_data[0] : pThis->drv_ctx.video_resolution.frame_height;
+
+ frame_data[3] = (p2 == OMX_IndexParamPortDefinition) ?
+ frame_data[1] : pThis->drv_ctx.video_resolution.frame_width;
+
pThis->m_cb.EventHandler(&pThis->m_cmp, pThis->m_app_data,
OMX_EventPortSettingsChanged, p1, p2, (void*) frame_data );
} else {