Piteball/android_hardware_qcom_media
1
0
Fork 0
mirror of https://github.com/followmsi/android_hardware_qcom_media.git synced 2024-10-31 22:47:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mm-video-v4l2: venc: Protect buffer from being freed while accessing"

Browse source 
This reverts commit 2c15b5832a.

Bug: 36130225
Bug: 67670457

Merged-In: Ibaccd96e730aa3b1d2061c991bb3c8946ba25a95
This commit is contained in:
Marco Nelissen 2017-10-12 08:51:41 -07:00
parent f32a9ed9ee
commit 3a48ecf6f6
3 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
msm8998/mm-video-v4l2/vidc/venc/inc/omx_video_base.h
View file

@ -687,7 +687,6 @@ class omx_video: public qc_omx_component
omx_cmd_queue m_opq_meta_q; omx_cmd_queue m_opq_meta_q;
omx_cmd_queue m_opq_pmem_q; omx_cmd_queue m_opq_pmem_q;
OMX_BUFFERHEADERTYPE meta_buffer_hdr[MAX_NUM_INPUT_BUFFERS]; OMX_BUFFERHEADERTYPE meta_buffer_hdr[MAX_NUM_INPUT_BUFFERS];
pthread_mutex_t m_buf_lock;
bool input_flush_progress; bool input_flush_progress;
bool output_flush_progress; bool output_flush_progress;

6
msm8998/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
View file

@ -328,8 +328,6 @@ omx_video::omx_video():
property_get("ro.board.platform", platform_name, "0"); property_get("ro.board.platform", platform_name, "0");
strlcpy(m_platform, platform_name, sizeof(m_platform)); strlcpy(m_platform, platform_name, sizeof(m_platform));
#endif #endif
pthread_mutex_init(&m_buf_lock, NULL);
} }
@ -371,8 +369,6 @@ omx_video::~omx_video()
sem_destroy(&m_cmd_lock); sem_destroy(&m_cmd_lock);
DEBUG_PRINT_HIGH("m_etb_count = %" PRIu64 ", m_fbd_count = %" PRIu64, m_etb_count, DEBUG_PRINT_HIGH("m_etb_count = %" PRIu64 ", m_fbd_count = %" PRIu64, m_etb_count,
m_fbd_count); m_fbd_count);
pthread_mutex_destroy(&m_buf_lock);
DEBUG_PRINT_HIGH("omx_video: Destructor exit"); DEBUG_PRINT_HIGH("omx_video: Destructor exit");
DEBUG_PRINT_HIGH("Exiting OMX Video Encoder ..."); DEBUG_PRINT_HIGH("Exiting OMX Video Encoder ...");
} }
@ -2746,7 +2742,6 @@ OMX_ERRORTYPE omx_video::use_output_buffer(
return OMX_ErrorBadParameter; return OMX_ErrorBadParameter;
} }
auto_lock l(m_buf_lock);
if (!m_out_mem_ptr) { if (!m_out_mem_ptr) {
output_use_buffer = true; output_use_buffer = true;
int nBufHdrSize = 0; int nBufHdrSize = 0;
@ -3697,7 +3692,6 @@ OMX_ERRORTYPE omx_video::free_buffer(OMX_IN OMX_HANDLETYPE hComp,
nPortIndex, (unsigned int)m_sOutPortDef.nBufferCountActual); nPortIndex, (unsigned int)m_sOutPortDef.nBufferCountActual);
if (nPortIndex < m_sOutPortDef.nBufferCountActual && if (nPortIndex < m_sOutPortDef.nBufferCountActual &&
BITMASK_PRESENT(&m_out_bm_count, nPortIndex)) { BITMASK_PRESENT(&m_out_bm_count, nPortIndex)) {
auto_lock l(m_buf_lock);
// Clear the bit associated with it. // Clear the bit associated with it.
BITMASK_CLEAR(&m_out_bm_count,nPortIndex); BITMASK_CLEAR(&m_out_bm_count,nPortIndex);
m_sOutPortDef.bPopulated = OMX_FALSE; m_sOutPortDef.bPopulated = OMX_FALSE;

10
msm8998/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
View file

@ -2658,17 +2658,10 @@ int omx_venc::async_message_process (void *context, void* message)
OMX_COMPONENT_GENERATE_EBD); OMX_COMPONENT_GENERATE_EBD);
break; break;
case VEN_MSG_OUTPUT_BUFFER_DONE: case VEN_MSG_OUTPUT_BUFFER_DONE:
{
omxhdr = (OMX_BUFFERHEADERTYPE*)m_sVenc_msg->buf.clientdata; omxhdr = (OMX_BUFFERHEADERTYPE*)m_sVenc_msg->buf.clientdata;
OMX_U32 bufIndex = (OMX_U32)(omxhdr - omx->m_out_mem_ptr);
if ( (omxhdr != NULL) && if ( (omxhdr != NULL) &&
(bufIndex < omx->m_sOutPortDef.nBufferCountActual)) { ((OMX_U32)(omxhdr - omx->m_out_mem_ptr) < omx->m_sOutPortDef.nBufferCountActual)) {
auto_lock l(omx->m_buf_lock);
if (BITMASK_ABSENT(&(omx->m_out_bm_count), bufIndex)) {
DEBUG_PRINT_ERROR("Recieved FBD for buffer that is already freed !");
break;
}
if (!omx->is_secure_session() && (m_sVenc_msg->buf.len <= omxhdr->nAllocLen)) { if (!omx->is_secure_session() && (m_sVenc_msg->buf.len <= omxhdr->nAllocLen)) {
omxhdr->nFilledLen = m_sVenc_msg->buf.len; omxhdr->nFilledLen = m_sVenc_msg->buf.len;
omxhdr->nOffset = m_sVenc_msg->buf.offset; omxhdr->nOffset = m_sVenc_msg->buf.offset;
@ -2711,7 +2704,6 @@ int omx_venc::async_message_process (void *context, void* message)
omx->post_event ((unsigned long)omxhdr,m_sVenc_msg->statuscode, omx->post_event ((unsigned long)omxhdr,m_sVenc_msg->statuscode,
OMX_COMPONENT_GENERATE_FBD); OMX_COMPONENT_GENERATE_FBD);
break; break;
}
case VEN_MSG_NEED_OUTPUT_BUFFER: case VEN_MSG_NEED_OUTPUT_BUFFER:
//TBD what action needs to be done here?? //TBD what action needs to be done here??
break; break;