dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "mm-audio: Fix 64 bit compilation warnings"

This commit is contained in:
Linux Build Service Account 2014-06-05 16:37:30 -07:00 committed by Gerrit - the friendly Code Review server
parent 04e5c07733 80a1156bf7
commit 614874c43a
8 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
View File

@ -47,7 +47,7 @@ void *omx_aac_msg(void *info)
{
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)

20
mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp
View File

@ -457,7 +457,7 @@ void omx_aac_aenc::buffer_done_cb(OMX_BUFFERHEADERTYPE *bufHdr)
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 @@ loopback_out:
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 @@ loopback_in:
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 @@ bool omx_aac_aenc::execute_input_omx_flush()
(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 @@ bool omx_aac_aenc::execute_input_omx_flush()
{
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 @@ bool omx_aac_aenc::execute_output_omx_flush()
(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 @@ bool omx_aac_aenc::execute_output_omx_flush()
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 @@ bool omx_aac_aenc::search_input_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ bool omx_aac_aenc::search_output_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ OMX_ERRORTYPE omx_aac_aenc::fill_this_buffer_proxy
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)

2
mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
View File

@ -47,7 +47,7 @@ void *omx_amr_msg(void *info)
{
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)

20
mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp
View File

@ -456,7 +456,7 @@ void omx_amr_aenc::buffer_done_cb(OMX_BUFFERHEADERTYPE *bufHdr)
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 @@ loopback_out:
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 @@ loopback_in:
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 @@ bool omx_amr_aenc::execute_input_omx_flush()
(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 @@ bool omx_amr_aenc::execute_input_omx_flush()
{
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 @@ bool omx_amr_aenc::execute_output_omx_flush()
(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 @@ bool omx_amr_aenc::execute_output_omx_flush()
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 @@ bool omx_amr_aenc::search_input_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ bool omx_amr_aenc::search_output_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ OMX_ERRORTYPE omx_amr_aenc::fill_this_buffer_proxy
{
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) {

2
mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
View File

@ -47,7 +47,7 @@ void *omx_evrc_msg(void *info)
{
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)

22
mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp
View File

@ -452,7 +452,7 @@ void omx_evrc_aenc::buffer_done_cb(OMX_BUFFERHEADERTYPE *bufHdr)
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 @@ loopback_out:
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 @@ loopback_in:
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 @@ bool omx_evrc_aenc::execute_input_omx_flush()
(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 @@ bool omx_evrc_aenc::execute_input_omx_flush()
{
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 @@ bool omx_evrc_aenc::execute_output_omx_flush()
(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 @@ bool omx_evrc_aenc::execute_output_omx_flush()
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 @@ bool omx_evrc_aenc::search_input_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ bool omx_evrc_aenc::search_output_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ OMX_ERRORTYPE omx_evrc_aenc::fill_this_buffer_proxy
{
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) {

2
mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
View File

@ -47,7 +47,7 @@ void *omx_qcelp13_msg(void *info)
{
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)

20
mm-audio/aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp
View File

@ -454,7 +454,7 @@ void omx_qcelp13_aenc::buffer_done_cb(OMX_BUFFERHEADERTYPE *bufHdr)
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 @@ loopback_out:
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 @@ loopback_in:
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 @@ bool omx_qcelp13_aenc::execute_input_omx_flush()
(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 @@ bool omx_qcelp13_aenc::execute_input_omx_flush()
{
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 @@ bool omx_qcelp13_aenc::execute_output_omx_flush()
(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 @@ bool omx_qcelp13_aenc::execute_output_omx_flush()
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 @@ bool omx_qcelp13_aenc::search_input_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ bool omx_qcelp13_aenc::search_output_bufhdr(OMX_BUFFERHEADERTYPE *buffer)
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 @@ OMX_ERRORTYPE omx_qcelp13_aenc::fill_this_buffer_proxy
{
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) {