diff options
| author | Wonsik Kim <wonsik@google.com> | 2016-05-26 19:20:40 +0900 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-08 16:46:37 -0700 |
| commit | d31c25c80c0f252b5a6df8181ce6c0439cd7892d (patch) | |
| tree | c4eed83d73156a51403806b0e046b75b1df1fa2f | |
| parent | dc650ec06c033648f3f5dd5634930ba7e9768b16 (diff) | |
| download | android_hardware_qcom_media-d31c25c80c0f252b5a6df8181ce6c0439cd7892d.tar.gz android_hardware_qcom_media-d31c25c80c0f252b5a6df8181ce6c0439cd7892d.tar.bz2 android_hardware_qcom_media-d31c25c80c0f252b5a6df8181ce6c0439cd7892d.zip | |
DO NOT MERGE Fix wrong nAllocLen
Set nAllocLen to the size of the opaque handle itself.
Ticket: CYNGNOS-3177
Bug: 28816964
Bug: 28816827
Change-Id: Id410e324bee291d4a0018dddb97eda9bbcded099
(cherry picked from commit eb71a633d180ee6a28398c096cd3ce3553d4916a)
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 5a084a82..59e572b5 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -2824,6 +2824,7 @@ OMX_ERRORTYPE omx_video::allocate_input_buffer( //This should only be used for passing reference to source type and //secure handle fd struct native_handle_t* m_pInput_pmem[i].buffer = malloc(sizeof(OMX_U32) + sizeof(native_handle_t*)); + (*bufferHdr)->nAllocLen = sizeof(OMX_U32) + sizeof(native_handle_t*); } (*bufferHdr)->pBuffer = (OMX_U8 *)m_pInput_pmem[i].buffer; @@ -2992,6 +2993,7 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer( //This should only be used for passing reference to source type and //secure handle fd struct native_handle_t* m_pOutput_pmem[i].buffer = malloc(sizeof(OMX_U32) + sizeof(native_handle_t*)); + (*bufferHdr)->nAllocLen = sizeof(OMX_U32) + sizeof(native_handle_t*); native_handle_t *handle = native_handle_create(1, 0); handle->data[0] = m_pOutput_pmem[i].fd; char *data = (char*) m_pOutput_pmem[i].buffer; |