diff options
author | Preetam Singh Ranawat <apranawat@codeaurora.org> | 2017-06-21 15:49:39 +0530 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2019-12-01 04:41:29 +0100 |
commit | c4a9fb916d15b8b31598a2d7260fe1ce96756e16 (patch) | |
tree | 8ca7359a38361901c79dff6da69b61d2baca7254 | |
parent | 4e064048230edf44c86e58e4d356e459b97a4dbf (diff) | |
download | hardware_qcom_audio-c4a9fb916d15b8b31598a2d7260fe1ce96756e16.tar.gz hardware_qcom_audio-c4a9fb916d15b8b31598a2d7260fe1ce96756e16.tar.bz2 hardware_qcom_audio-c4a9fb916d15b8b31598a2d7260fe1ce96756e16.zip |
mm-audio: Fix clang error for encoders
Change-Id: I13203ad8bc17889b0e391406e9deec4275fad808
-rw-r--r-- | mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp | 15 | ||||
-rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp | 17 | ||||
-rw-r--r-- | mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp | 17 | ||||
-rw-r--r-- | mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp | 17 |
4 files changed, 31 insertions, 35 deletions
diff --git a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp index 4e598fb9..781941fc 100644 --- a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp +++ b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp @@ -3661,7 +3661,6 @@ OMX_ERRORTYPE omx_aac_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) { @@ -3677,11 +3676,10 @@ OMX_ERRORTYPE omx_aac_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)); @@ -3746,7 +3744,6 @@ OMX_ERRORTYPE omx_aac_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) { @@ -3765,11 +3762,10 @@ OMX_ERRORTYPE omx_aac_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)); @@ -4107,6 +4103,9 @@ OMX_ERRORTYPE omx_aac_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; } if (ts == 0) { 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); diff --git a/mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp b/mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp index 84bb7744..fc9d1fa4 100644 --- a/mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp +++ b/mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010, 2014-2016, The Linux Foundation. All rights reserved. +Copyright (c) 2010, 2014-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: @@ -3563,7 +3563,6 @@ OMX_ERRORTYPE omx_evrc_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) { @@ -3579,11 +3578,10 @@ OMX_ERRORTYPE omx_evrc_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)); @@ -3648,7 +3646,6 @@ OMX_ERRORTYPE omx_evrc_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) { @@ -3667,11 +3664,10 @@ OMX_ERRORTYPE omx_evrc_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)); @@ -4011,6 +4007,9 @@ OMX_ERRORTYPE omx_evrc_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); diff --git a/mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp b/mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp index 1d7962ba..6e6a360a 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp +++ b/mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010, 2014-2016, The Linux Foundation. All rights reserved. +Copyright (c) 2010, 2014-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: @@ -3560,7 +3560,6 @@ OMX_ERRORTYPE omx_qcelp13_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) { @@ -3576,11 +3575,10 @@ OMX_ERRORTYPE omx_qcelp13_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)); @@ -3645,7 +3643,6 @@ OMX_ERRORTYPE omx_qcelp13_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) { @@ -3664,11 +3661,10 @@ OMX_ERRORTYPE omx_qcelp13_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)); @@ -4009,6 +4005,9 @@ OMX_ERRORTYPE omx_qcelp13_aenc::empty_this_buffer_proxy } memcpy(data,&meta_in, meta_in.offsetVal); DEBUG_PRINT("meta_in.nFlags = 0x%8x\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); |