mm-audio: Fix 64 bit compilation warnings
Fix compilation warnings seen with 64 bit lpdk builds
Change-Id: Ia82c54f81531c31569a96b8cdde48b7f7fc7a4b7
diff --git a/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c b/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
index a7c2a42..9a8448a 100644
--- a/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
@@ -47,7 +47,7 @@
{
struct aac_ipc_info *aac_info = (struct aac_ipc_info*)info;
unsigned char id;
- int n;
+ ssize_t n;
DEBUG_DETAIL("\n%s: message thread start\n", __FUNCTION__);
while (!aac_info->dead)
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 c918268..45f2208 100644
--- a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp
+++ b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp
@@ -457,7 +457,7 @@
pthread_mutex_lock(&in_buf_count_lock);
m_aac_pb_stats.ebd_cnt++;
nNumInputBuf--;
- DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d\n",\
+ DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d ebd_cnd %d\n",\
m_aac_pb_stats.tot_in_buf_len,
nNumInputBuf, m_aac_pb_stats.ebd_cnt);
pthread_mutex_unlock(&in_buf_count_lock);
@@ -713,7 +713,7 @@
pThis->execute_output_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
} else
{
@@ -1029,7 +1029,7 @@
pThis->execute_input_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
}
else
@@ -2219,7 +2219,7 @@
(ident == OMX_COMPONENT_GENERATE_BUFFER_DONE))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Flush:Input dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:Input dataq=%p \n", omx_buf);
omx_buf->nFilledLen = 0;
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
@@ -2230,7 +2230,7 @@
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
omx_buf->nFilledLen = 0;
- DEBUG_DETAIL("Flush:ctrl dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:ctrl dataq=%p \n", omx_buf);
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
} else
@@ -2298,7 +2298,7 @@
(OMX_COMPONENT_GENERATE_FRAME_DONE == ident))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n",\
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n",\
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -2311,7 +2311,7 @@
if (OMX_COMPONENT_GENERATE_FRAME_DONE == ident)
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n", \
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n", \
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -3805,7 +3805,7 @@
temp = m_input_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_input_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_input_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -3827,7 +3827,7 @@
temp = m_output_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_output_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_output_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -4143,7 +4143,7 @@
DEBUG_PRINT("\nBefore Read..m_drv_fd = %d,\n",m_drv_fd);
nReadbytes = read(m_drv_fd,m_tmp_out_meta_buf,output_buffer_size );
- DEBUG_DETAIL("FTBP->Al_len[%d]buf[%p]size[%d]numOutBuf[%d]\n",\
+ DEBUG_DETAIL("FTBP->Al_len[%lu]buf[%p]size[%d]numOutBuf[%d]\n",\
buffer->nAllocLen,m_tmp_out_meta_buf,
nReadbytes,nNumOutputBuf);
if(*m_tmp_out_meta_buf <= 0)
diff --git a/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c b/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
index 199358f..dea7c7f 100644
--- a/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
@@ -47,7 +47,7 @@
{
struct amr_ipc_info *amr_info = (struct amr_ipc_info*)info;
unsigned char id;
- int n;
+ ssize_t n;
DEBUG_DETAIL("\n%s: message thread start\n", __FUNCTION__);
while (!amr_info->dead)
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 f322b40..5e9ee4e 100644
--- a/mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp
+++ b/mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp
@@ -456,7 +456,7 @@
pthread_mutex_lock(&in_buf_count_lock);
m_amr_pb_stats.ebd_cnt++;
nNumInputBuf--;
- DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d\n",\
+ DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d ebd_cnt=%d\n",\
m_amr_pb_stats.tot_in_buf_len,
nNumInputBuf, m_amr_pb_stats.ebd_cnt);
pthread_mutex_unlock(&in_buf_count_lock);
@@ -712,7 +712,7 @@
pThis->execute_output_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
} else
{
@@ -1028,7 +1028,7 @@
pThis->execute_input_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
}
else
@@ -2134,7 +2134,7 @@
(ident == OMX_COMPONENT_GENERATE_BUFFER_DONE))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Flush:Input dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:Input dataq=%p \n", omx_buf);
omx_buf->nFilledLen = 0;
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
@@ -2145,7 +2145,7 @@
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
omx_buf->nFilledLen = 0;
- DEBUG_DETAIL("Flush:ctrl dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:ctrl dataq=%p \n", omx_buf);
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
} else
@@ -2213,7 +2213,7 @@
(OMX_COMPONENT_GENERATE_FRAME_DONE == ident))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n",\
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n",\
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -2226,7 +2226,7 @@
if (OMX_COMPONENT_GENERATE_FRAME_DONE == ident)
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n", \
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n", \
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -3706,7 +3706,7 @@
temp = m_input_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_input_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_input_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -3728,7 +3728,7 @@
temp = m_output_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_output_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_output_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -4039,7 +4039,7 @@
{
DEBUG_PRINT("\nBefore Read..m_drv_fd = %d,\n",m_drv_fd);
nReadbytes = read(m_drv_fd,buffer->pBuffer,output_buffer_size );
- DEBUG_DETAIL("FTBP->Al_len[%d]buf[%p]size[%d]numOutBuf[%d]\n",\
+ DEBUG_DETAIL("FTBP->Al_len[%lu]buf[%p]size[%d]numOutBuf[%d]\n",\
buffer->nAllocLen,buffer->pBuffer,
nReadbytes,nNumOutputBuf);
if (nReadbytes <= 0) {
diff --git a/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c b/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
index 2128718..4f828fc 100644
--- a/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
@@ -47,7 +47,7 @@
{
struct evrc_ipc_info *evrc_info = (struct evrc_ipc_info*)info;
unsigned char id;
- int n;
+ ssize_t n;
DEBUG_DETAIL("\n%s: message thread start\n", __FUNCTION__);
while (!evrc_info->dead)
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 d19320f..8200365 100644
--- a/mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp
+++ b/mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp
@@ -452,7 +452,7 @@
pthread_mutex_lock(&in_buf_count_lock);
m_evrc_pb_stats.ebd_cnt++;
nNumInputBuf--;
- DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d\n",\
+ DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d %d ebd_cnt %d \n",\
m_evrc_pb_stats.tot_in_buf_len,
nNumInputBuf, m_evrc_pb_stats.ebd_cnt);
pthread_mutex_unlock(&in_buf_count_lock);
@@ -708,7 +708,7 @@
pThis->execute_output_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
} else
{
@@ -1024,12 +1024,12 @@
pThis->execute_input_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
}
else
{
- DEBUG_PRINT_ERROR("ERROR:IN-->Invalid Id[%d]\n",id);
+ DEBUG_PRINT_ERROR("ERROR:IN-->Invalid Id[%u]\n",id);
}
} else
{
@@ -2136,7 +2136,7 @@
(ident == OMX_COMPONENT_GENERATE_BUFFER_DONE))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Flush:Input dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:Input dataq=%p \n", omx_buf);
omx_buf->nFilledLen = 0;
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
@@ -2147,7 +2147,7 @@
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
omx_buf->nFilledLen = 0;
- DEBUG_DETAIL("Flush:ctrl dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:ctrl dataq=%p \n", omx_buf);
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
} else
@@ -2215,7 +2215,7 @@
(OMX_COMPONENT_GENERATE_FRAME_DONE == ident))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n",\
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n",\
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -2228,7 +2228,7 @@
if (OMX_COMPONENT_GENERATE_FRAME_DONE == ident)
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n", \
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n", \
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -3708,7 +3708,7 @@
temp = m_input_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_input_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_input_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -3730,7 +3730,7 @@
temp = m_output_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_output_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_output_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -4041,7 +4041,7 @@
{
DEBUG_PRINT("\nBefore Read..m_drv_fd = %d,\n",m_drv_fd);
nReadbytes = read(m_drv_fd,buffer->pBuffer,output_buffer_size );
- DEBUG_DETAIL("FTBP->Al_len[%d]buf[%p]size[%d]numOutBuf[%d]\n",\
+ DEBUG_DETAIL("FTBP->Al_len[%lu]buf[%p]size[%d]numOutBuf[%d]\n",\
buffer->nAllocLen,buffer->pBuffer,
nReadbytes,nNumOutputBuf);
if (nReadbytes <= 0) {
diff --git a/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c b/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
index b39f625..bdc96ac 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
@@ -47,7 +47,7 @@
{
struct qcelp13_ipc_info *qcelp13_info = (struct qcelp13_ipc_info*)info;
unsigned char id;
- int n;
+ ssize_t n;
DEBUG_DETAIL("\n%s: message thread start\n", __FUNCTION__);
while (!qcelp13_info->dead)
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 b63f5a2..399b8cf 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp
+++ b/mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp
@@ -454,7 +454,7 @@
pthread_mutex_lock(&in_buf_count_lock);
m_qcelp13_pb_stats.ebd_cnt++;
nNumInputBuf--;
- DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d\n",\
+ DEBUG_DETAIL("EBD CB:: in_buf_len=%d nNumInputBuf=%d\n ebd_cnt=%d",\
m_qcelp13_pb_stats.tot_in_buf_len,
nNumInputBuf, m_qcelp13_pb_stats.ebd_cnt);
pthread_mutex_unlock(&in_buf_count_lock);
@@ -710,7 +710,7 @@
pThis->execute_output_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
} else
{
@@ -1026,7 +1026,7 @@
pThis->execute_input_omx_flush();
} else
{
- DEBUG_DETAIL("Invalid command[%d]\n",p1);
+ DEBUG_DETAIL("Invalid command[%lu]\n",p1);
}
}
else
@@ -2132,7 +2132,7 @@
(ident == OMX_COMPONENT_GENERATE_BUFFER_DONE))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Flush:Input dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:Input dataq=%p \n", omx_buf);
omx_buf->nFilledLen = 0;
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
@@ -2143,7 +2143,7 @@
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
omx_buf->nFilledLen = 0;
- DEBUG_DETAIL("Flush:ctrl dataq=0x%x \n", omx_buf);
+ DEBUG_DETAIL("Flush:ctrl dataq=%p \n", omx_buf);
buffer_done_cb((OMX_BUFFERHEADERTYPE *)omx_buf);
}
} else
@@ -2211,7 +2211,7 @@
(OMX_COMPONENT_GENERATE_FRAME_DONE == ident))
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n",\
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n",\
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -2224,7 +2224,7 @@
if (OMX_COMPONENT_GENERATE_FRAME_DONE == ident)
{
omx_buf = (OMX_BUFFERHEADERTYPE *) p2;
- DEBUG_DETAIL("Ouput Buf_Addr=%x TS[0x%x] \n", \
+ DEBUG_DETAIL("Ouput Buf_Addr=%p TS[0x%x] \n", \
omx_buf,nTimestamp);
omx_buf->nTimeStamp = nTimestamp;
omx_buf->nFilledLen = 0;
@@ -3705,7 +3705,7 @@
temp = m_input_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_input_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_input_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -3727,7 +3727,7 @@
temp = m_output_buf_hdrs.find_ele(buffer);
if (buffer && temp)
{
- DEBUG_DETAIL("search_output_bufhdr %x \n", buffer);
+ DEBUG_DETAIL("search_output_bufhdr %p \n", buffer);
eRet = true;
}
return eRet;
@@ -4039,7 +4039,7 @@
{
DEBUG_PRINT("\nBefore Read..m_drv_fd = %d,\n",m_drv_fd);
nReadbytes = read(m_drv_fd,buffer->pBuffer,output_buffer_size );
- DEBUG_DETAIL("FTBP->Al_len[%d]buf[%p]size[%d]numOutBuf[%d]\n",\
+ DEBUG_DETAIL("FTBP->Al_len[%lu]buf[%p]size[%d]numOutBuf[%d]\n",\
buffer->nAllocLen,buffer->pBuffer,
nReadbytes,nNumOutputBuf);
if (nReadbytes <= 0) {