mm-video: vidc: fix memory leak in dynamic buffer mode
In dynamic buffer mode, for non-secure playback,
output buffer is mapped before each ftb to driver.
This buffer is unmapped in the fbd. During flush
operations, the mapped buffer in ftb is not freed
leading to memory leak. To fix the issue, move
the memory mapping to just before sending the ftb
to driver.
Change-Id: Ib0e5525fdf8132434800bf4d4ff8d27b085fc8fc
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 e921397..a1313e2 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -5740,7 +5740,6 @@
if (dynamic_buf_mode) {
private_handle_t *handle = NULL;
struct VideoDecoderOutputMetaData *meta;
- OMX_U8 *buff = NULL;
unsigned int nPortIndex = 0;
if (!buffer || !buffer->pBuffer) {
@@ -5757,24 +5756,10 @@
DEBUG_PRINT_ERROR("FTB: Error: IL client passed an invalid buf handle - %p", handle);
return OMX_ErrorBadParameter;
}
-
- //map the buffer handle based on the size set on output port definition.
- if (!secure_mode) {
- buff = (OMX_U8*)mmap(0, drv_ctx.op_buf.buffer_size,
- PROT_READ|PROT_WRITE, MAP_SHARED, handle->fd, 0);
- } else {
- buff = (OMX_U8*) buffer;
- }
-
//Fill outputbuffer with buffer details, this will be sent to f/w during VIDIOC_QBUF
nPortIndex = buffer-((OMX_BUFFERHEADERTYPE *)client_buffers.get_il_buf_hdr());
drv_ctx.ptr_outputbuffer[nPortIndex].pmem_fd = handle->fd;
- drv_ctx.ptr_outputbuffer[nPortIndex].offset = 0;
- drv_ctx.ptr_outputbuffer[nPortIndex].bufferaddr = buff;
- drv_ctx.ptr_outputbuffer[nPortIndex].buffer_len = drv_ctx.op_buf.buffer_size;
- drv_ctx.ptr_outputbuffer[nPortIndex].mmaped_size = drv_ctx.op_buf.buffer_size;
- buf_ref_add(drv_ctx.ptr_outputbuffer[nPortIndex].pmem_fd,
- drv_ctx.ptr_outputbuffer[nPortIndex].offset);
+ drv_ctx.ptr_outputbuffer[nPortIndex].bufferaddr = (OMX_U8*) buffer;
//Store private handle from GraphicBuffer
native_buffer[nPortIndex].privatehandle = handle;
@@ -5845,6 +5830,22 @@
m_cb.FillBufferDone (hComp,m_app_data,buffer);
return OMX_ErrorNone;
}
+
+ if (dynamic_buf_mode) {
+ //map the buffer handle based on the size set on output port definition.
+ if (!secure_mode) {
+ drv_ctx.ptr_outputbuffer[nPortIndex].bufferaddr =
+ (OMX_U8*)mmap(0, drv_ctx.op_buf.buffer_size,
+ PROT_READ|PROT_WRITE, MAP_SHARED,
+ drv_ctx.ptr_outputbuffer[nPortIndex].pmem_fd, 0);
+ }
+ drv_ctx.ptr_outputbuffer[nPortIndex].offset = 0;
+ drv_ctx.ptr_outputbuffer[nPortIndex].buffer_len = drv_ctx.op_buf.buffer_size;
+ drv_ctx.ptr_outputbuffer[nPortIndex].mmaped_size = drv_ctx.op_buf.buffer_size;
+ buf_ref_add(drv_ctx.ptr_outputbuffer[nPortIndex].pmem_fd,
+ drv_ctx.ptr_outputbuffer[nPortIndex].offset);
+ }
+
pending_output_buffers++;
buffer = client_buffers.get_dr_buf_hdr(bufferAdd);
ptr_respbuffer = (struct vdec_output_frameinfo*)buffer->pOutputPortPrivate;