diff options
| author | Wonsik Kim <wonsik@google.com> | 2016-05-26 19:20:40 +0900 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-06-23 15:06:38 -0700 |
| commit | d575ecf607056d8e3328ef2eb56c52e98f81e87d (patch) | |
| tree | 08b9dd6d4043e64f680d8e97ae4a15fa34ab1b47 | |
| parent | 4ed06d14080d8667d5be14eed200e378cba78345 (diff) | |
| download | android_hardware_qcom_media-d575ecf607056d8e3328ef2eb56c52e98f81e87d.tar.gz android_hardware_qcom_media-d575ecf607056d8e3328ef2eb56c52e98f81e87d.tar.bz2 android_hardware_qcom_media-d575ecf607056d8e3328ef2eb56c52e98f81e87d.zip | |
DO NOT MERGE Fix wrong nAllocLen
Set nAllocLen to the size of the opaque handle itself.
Bug: 28816964
Bug: 28816827
Change-Id: Id410e324bee291d4a0018dddb97eda9bbcded099
| -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 21573e7a..815ab28b 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -2871,6 +2871,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; @@ -3039,6 +3040,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; |