diff options
| author | Wonsik Kim <wonsik@google.com> | 2016-05-26 11:38:21 +0900 |
|---|---|---|
| committer | Wonsik Kim <wonsik@google.com> | 2016-06-02 19:00:09 +0900 |
| commit | 3957953f027b784f2d55d96d388c8107371eb9db (patch) | |
| tree | d80812b0004a762b5153d9047e680c10a76bb86b /msm8974 | |
| parent | a8fcf27d158120163227dfb16d758deed294bbd2 (diff) | |
| download | media-3957953f027b784f2d55d96d388c8107371eb9db.tar.gz | |
Fix wrong nAllocLen
Set nAllocLen to the size of the opaque handle itself.
Bug: 28816964
Bug: 28816827
Change-Id: Id410e324bee291d4a0018dddb97eda9bbcded099
Diffstat (limited to 'msm8974')
| -rw-r--r-- | msm8974/mm-video-legacy/vidc/venc/src/omx_video_base.cpp | 4 | ||||
| -rw-r--r-- | msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/msm8974/mm-video-legacy/vidc/venc/src/omx_video_base.cpp b/msm8974/mm-video-legacy/vidc/venc/src/omx_video_base.cpp index dd4d98d..2b62fa1 100644 --- a/msm8974/mm-video-legacy/vidc/venc/src/omx_video_base.cpp +++ b/msm8974/mm-video-legacy/vidc/venc/src/omx_video_base.cpp @@ -2648,7 +2648,7 @@ OMX_ERRORTYPE omx_video::allocate_input_meta_buffer( *bufferHdr = &meta_buffer_hdr[index]; memset(&meta_buffer_hdr[index], 0, sizeof(meta_buffer_hdr[index])); meta_buffer_hdr[index].nSize = sizeof(meta_buffer_hdr[index]); - meta_buffer_hdr[index].nAllocLen = bytes; + meta_buffer_hdr[index].nAllocLen = sizeof(meta_buffers[index]); meta_buffer_hdr[index].nVersion.nVersion = OMX_SPEC_VERSION; meta_buffer_hdr[index].nInputPortIndex = PORT_INDEX_IN; meta_buffer_hdr[index].pBuffer = (OMX_U8*)&meta_buffers[index]; @@ -2873,7 +2873,7 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer( bufHdr->nSize = sizeof(OMX_BUFFERHEADERTYPE); bufHdr->nVersion.nVersion = OMX_SPEC_VERSION; // Set the values when we determine the right HxW param - bufHdr->nAllocLen = bytes; + bufHdr->nAllocLen = m_sOutPortDef.nBufferSize; bufHdr->nFilledLen = 0; bufHdr->pAppPrivate = appData; bufHdr->nOutputPortIndex = PORT_INDEX_OUT; diff --git a/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 3d77f30..0ded6ef 100644 --- a/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/msm8974/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -2737,7 +2737,7 @@ OMX_ERRORTYPE omx_video::allocate_input_meta_buffer( *bufferHdr = &meta_buffer_hdr[index]; memset(&meta_buffer_hdr[index], 0, sizeof(meta_buffer_hdr[index])); meta_buffer_hdr[index].nSize = sizeof(meta_buffer_hdr[index]); - meta_buffer_hdr[index].nAllocLen = bytes; + meta_buffer_hdr[index].nAllocLen = sizeof(meta_buffers[index]); meta_buffer_hdr[index].nVersion.nVersion = OMX_SPEC_VERSION; meta_buffer_hdr[index].nInputPortIndex = PORT_INDEX_IN; meta_buffer_hdr[index].pBuffer = (OMX_U8*)&meta_buffers[index]; @@ -2962,7 +2962,7 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer( bufHdr->nSize = sizeof(OMX_BUFFERHEADERTYPE); bufHdr->nVersion.nVersion = OMX_SPEC_VERSION; // Set the values when we determine the right HxW param - bufHdr->nAllocLen = bytes; + bufHdr->nAllocLen = m_sOutPortDef.nBufferSize; bufHdr->nFilledLen = 0; bufHdr->pAppPrivate = appData; bufHdr->nOutputPortIndex = PORT_INDEX_OUT; |