mm-audio: Fix clang error for encoders
Change-Id: I13203ad8bc17889b0e391406e9deec4275fad808
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 3a25c87..95e5168 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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes, input_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3677,11 +3676,10 @@
}
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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes,output_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3765,11 +3762,10 @@
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 @@
}
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 84e6fce..f9ce126 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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes, input_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3651,11 +3650,10 @@
}
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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes,output_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3739,11 +3736,10 @@
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 @@
}
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 84bb774..fc9d1fa 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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes, input_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3579,11 +3578,10 @@
}
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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes,output_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3667,11 +3664,10 @@
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 @@
}
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-g711/qdsp6/src/omx_g711_aenc.cpp b/mm-audio/aenc-g711/qdsp6/src/omx_g711_aenc.cpp
index 23fe28a..69ab0a4 100644
--- a/mm-audio/aenc-g711/qdsp6/src/omx_g711_aenc.cpp
+++ b/mm-audio/aenc-g711/qdsp6/src/omx_g711_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
@@ -3567,7 +3567,6 @@
OMX_ERRORTYPE eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes, input_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3583,11 +3582,10 @@
}
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));
@@ -3652,7 +3650,6 @@
OMX_ERRORTYPE eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes,output_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3671,11 +3668,10 @@
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;
OMX_LOGV("BufHdr=%p buffer=%p\n",bufHdr,buffer);
*bufferHdr = bufHdr;
memset(bufHdr,0,sizeof(OMX_BUFFERHEADERTYPE));
@@ -4016,6 +4012,9 @@
}
memcpy(data,&meta_in, meta_in.offsetVal);
OMX_LOGV("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);
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 1d7962b..6e6a360 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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes, input_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3576,11 +3575,10 @@
}
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 eRet = OMX_ErrorNone;
OMX_BUFFERHEADERTYPE *bufHdr;
unsigned nBufSize = MAX(bytes,output_buffer_size);
- char *buf_ptr;
if(hComp == NULL)
{
@@ -3664,11 +3661,10 @@
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 @@
}
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);