diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-04 23:16:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-04 23:16:51 -0700 |
| commit | 119bc8972716114906fd16dc882505f2f5b106ae (patch) | |
| tree | 551aaf7347a3b827e33b126238ef0ecd165e55c5 /mm-video-v4l2 | |
| parent | c6a3f9f24edf92868aac5f1f59d1b98ce914b1be (diff) | |
| parent | b81dde84eeefee79e460dd403c8d2ce65a1d35a0 (diff) | |
| download | media-119bc8972716114906fd16dc882505f2f5b106ae.tar.gz | |
Merge "mm-video-v4l2: vdec: add mark data support"
Diffstat (limited to 'mm-video-v4l2')
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 5 |
1 files changed, 5 insertions, 0 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 b762c392..ba5436ec 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -6962,6 +6962,8 @@ OMX_ERRORTYPE omx_vdec::empty_this_buffer_proxy(OMX_IN OMX_HANDLETYPE hComp, (unsigned long)temp_buffer->offset; plane.reserved[0] = temp_buffer->pmem_fd; plane.reserved[1] = temp_buffer->offset; + plane.reserved[3] = (unsigned long)buffer->pMarkData; + plane.reserved[4] = (unsigned long)buffer->hMarkTargetComponent; plane.data_offset = 0; buf.m.planes = &plane; buf.length = 1; @@ -8220,6 +8222,9 @@ int omx_vdec::async_message_process (void *context, void* message) (((struct vdec_output_frameinfo *)omxhdr->pOutputPortPrivate - omx->drv_ctx.ptr_respbuffer) < (int)omx->drv_ctx.op_buf.actualcount)) { + omxhdr->pMarkData = (OMX_PTR)(unsigned long)plane[0].reserved[3]; + omxhdr->hMarkTargetComponent = (OMX_HANDLETYPE)(unsigned long)plane[0].reserved[4]; + if (vdec_msg->msgdata.output_frame.len <= omxhdr->nAllocLen) { omxhdr->nFilledLen = vdec_msg->msgdata.output_frame.len; omxhdr->nOffset = vdec_msg->msgdata.output_frame.offset; |