diff options
Diffstat (limited to 'mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp')
| -rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp b/mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp index 84e6fce5..f9ce126a 100644 --- a/mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp +++ b/mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010, 2014, 2016, The Linux Foundation. All rights reserved. +Copyright (c) 2010, 2014, 2016-2017, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -3635,7 +3635,6 @@ OMX_ERRORTYPE omx_amr_aenc::use_input_buffer OMX_ERRORTYPE eRet = OMX_ErrorNone; OMX_BUFFERHEADERTYPE *bufHdr; unsigned nBufSize = MAX(bytes, input_buffer_size); - char *buf_ptr; if(hComp == NULL) { @@ -3651,11 +3650,10 @@ OMX_ERRORTYPE omx_amr_aenc::use_input_buffer } if (m_inp_current_buf_count < m_inp_act_buf_count) { - buf_ptr = (char *) calloc(sizeof(OMX_BUFFERHEADERTYPE), 1); + bufHdr = (OMX_BUFFERHEADERTYPE *) calloc(sizeof(OMX_BUFFERHEADERTYPE), 1); - if (buf_ptr != NULL) + if (bufHdr != NULL) { - bufHdr = (OMX_BUFFERHEADERTYPE *) buf_ptr; *bufferHdr = bufHdr; memset(bufHdr,0,sizeof(OMX_BUFFERHEADERTYPE)); @@ -3720,7 +3718,6 @@ OMX_ERRORTYPE omx_amr_aenc::use_output_buffer OMX_ERRORTYPE eRet = OMX_ErrorNone; OMX_BUFFERHEADERTYPE *bufHdr; unsigned nBufSize = MAX(bytes,output_buffer_size); - char *buf_ptr; if(hComp == NULL) { @@ -3739,11 +3736,10 @@ OMX_ERRORTYPE omx_amr_aenc::use_output_buffer if (m_out_current_buf_count < m_out_act_buf_count) { - buf_ptr = (char *) calloc(sizeof(OMX_BUFFERHEADERTYPE), 1); + bufHdr = (OMX_BUFFERHEADERTYPE *) calloc(sizeof(OMX_BUFFERHEADERTYPE), 1); - if (buf_ptr != NULL) + if (bufHdr != NULL) { - bufHdr = (OMX_BUFFERHEADERTYPE *) buf_ptr; DEBUG_PRINT("BufHdr=%p buffer=%p\n",bufHdr,buffer); *bufferHdr = bufHdr; memset(bufHdr,0,sizeof(OMX_BUFFERHEADERTYPE)); @@ -4081,6 +4077,9 @@ OMX_ERRORTYPE omx_amr_aenc::empty_this_buffer_proxy } memcpy(data,&meta_in, meta_in.offsetVal); DEBUG_PRINT("meta_in.nFlags = %d\n",meta_in.nFlags); + } else { + DEBUG_PRINT_ERROR("temp meta is null buf\n"); + return OMX_ErrorInsufficientResources; } memcpy(&data[sizeof(META_IN)],buffer->pBuffer,buffer->nFilledLen); |