mirror of
https://github.com/followmsi/android_hardware_qcom_media.git
synced 2024-10-31 22:47:35 +00:00
Merge cherrypicks of [3054801, 3054802, 3054803, 3055198, 3055199, 3055200] into oc-mr1-release
Change-Id: I83f412e33719f80ca77624838c6abd755f455cba
This commit is contained in:
commit
765426b798
3 changed files with 8 additions and 45 deletions
|
@ -690,7 +690,6 @@ class omx_video: public qc_omx_component
|
|||
omx_cmd_queue m_opq_meta_q;
|
||||
omx_cmd_queue m_opq_pmem_q;
|
||||
OMX_BUFFERHEADERTYPE meta_buffer_hdr[MAX_NUM_INPUT_BUFFERS];
|
||||
pthread_mutex_t m_buf_lock;
|
||||
|
||||
bool input_flush_progress;
|
||||
bool output_flush_progress;
|
||||
|
@ -702,8 +701,6 @@ class omx_video: public qc_omx_component
|
|||
bool allocate_native_handle;
|
||||
|
||||
uint64_t m_out_bm_count;
|
||||
uint64_t m_client_out_bm_count;
|
||||
uint64_t m_client_in_bm_count;
|
||||
uint64_t m_inp_bm_count;
|
||||
uint64_t m_flags;
|
||||
uint64_t m_etb_count;
|
||||
|
|
|
@ -289,8 +289,6 @@ omx_video::omx_video():
|
|||
pending_output_buffers(0),
|
||||
allocate_native_handle(false),
|
||||
m_out_bm_count(0),
|
||||
m_client_out_bm_count(0),
|
||||
m_client_in_bm_count(0),
|
||||
m_inp_bm_count(0),
|
||||
m_flags(0),
|
||||
m_etb_count(0),
|
||||
|
@ -322,8 +320,6 @@ omx_video::omx_video():
|
|||
property_get("ro.board.platform", platform_name, "0");
|
||||
strlcpy(m_platform, platform_name, sizeof(m_platform));
|
||||
#endif
|
||||
|
||||
pthread_mutex_init(&m_buf_lock, NULL);
|
||||
}
|
||||
|
||||
|
||||
|
@ -365,8 +361,6 @@ omx_video::~omx_video()
|
|||
sem_destroy(&m_cmd_lock);
|
||||
DEBUG_PRINT_HIGH("m_etb_count = %" PRIu64 ", m_fbd_count = %" PRIu64, m_etb_count,
|
||||
m_fbd_count);
|
||||
|
||||
pthread_mutex_destroy(&m_buf_lock);
|
||||
DEBUG_PRINT_HIGH("omx_video: Destructor exit");
|
||||
DEBUG_PRINT_HIGH("Exiting OMX Video Encoder ...");
|
||||
}
|
||||
|
@ -2625,7 +2619,6 @@ OMX_ERRORTYPE omx_video::use_input_buffer(
|
|||
|
||||
*bufferHdr = (m_inp_mem_ptr + i);
|
||||
BITMASK_SET(&m_inp_bm_count,i);
|
||||
BITMASK_SET(&m_client_in_bm_count,i);
|
||||
|
||||
(*bufferHdr)->pBuffer = (OMX_U8 *)buffer;
|
||||
(*bufferHdr)->nSize = sizeof(OMX_BUFFERHEADERTYPE);
|
||||
|
@ -2754,7 +2747,6 @@ OMX_ERRORTYPE omx_video::use_output_buffer(
|
|||
return OMX_ErrorBadParameter;
|
||||
}
|
||||
|
||||
auto_lock l(m_buf_lock);
|
||||
if (!m_out_mem_ptr) {
|
||||
output_use_buffer = true;
|
||||
int nBufHdrSize = 0;
|
||||
|
@ -2905,7 +2897,6 @@ OMX_ERRORTYPE omx_video::use_output_buffer(
|
|||
}
|
||||
|
||||
BITMASK_SET(&m_out_bm_count,i);
|
||||
BITMASK_SET(&m_client_out_bm_count,i);
|
||||
} else {
|
||||
DEBUG_PRINT_ERROR("ERROR: All o/p Buffers have been Used, invalid use_buf call for "
|
||||
"index = %u", i);
|
||||
|
@ -2943,8 +2934,6 @@ OMX_ERRORTYPE omx_video::use_buffer(
|
|||
DEBUG_PRINT_ERROR("ERROR: Use Buffer in Invalid State");
|
||||
return OMX_ErrorInvalidState;
|
||||
}
|
||||
|
||||
auto_lock l(m_buf_lock);
|
||||
if (port == PORT_INDEX_IN) {
|
||||
auto_lock l(m_lock);
|
||||
eRet = use_input_buffer(hComp,bufferHdr,port,appData,bytes,buffer);
|
||||
|
@ -2954,6 +2943,7 @@ OMX_ERRORTYPE omx_video::use_buffer(
|
|||
DEBUG_PRINT_ERROR("ERROR: Invalid Port Index received %d",(int)port);
|
||||
eRet = OMX_ErrorBadPortIndex;
|
||||
}
|
||||
|
||||
if (eRet == OMX_ErrorNone) {
|
||||
if (allocate_done()) {
|
||||
if (BITMASK_PRESENT(&m_flags,OMX_COMPONENT_IDLE_PENDING)) {
|
||||
|
@ -3016,6 +3006,7 @@ OMX_ERRORTYPE omx_video::free_input_buffer(OMX_BUFFERHEADERTYPE *bufferHdr)
|
|||
}
|
||||
|
||||
if (index < m_sInPortDef.nBufferCountActual && m_pInput_pmem) {
|
||||
auto_lock l(m_lock);
|
||||
|
||||
if (mUseProxyColorFormat) {
|
||||
if (m_opq_pmem_q.m_size) {
|
||||
|
@ -3569,7 +3560,7 @@ OMX_ERRORTYPE omx_video::allocate_buffer(OMX_IN OMX_HANDLETYPE h
|
|||
DEBUG_PRINT_ERROR("ERROR: Allocate Buf in Invalid State");
|
||||
return OMX_ErrorInvalidState;
|
||||
}
|
||||
auto_lock l(m_buf_lock);
|
||||
|
||||
// What if the client calls again.
|
||||
if (port == PORT_INDEX_IN) {
|
||||
auto_lock l(m_lock);
|
||||
|
@ -3641,16 +3632,7 @@ OMX_ERRORTYPE omx_video::free_buffer(OMX_IN OMX_HANDLETYPE hComp,
|
|||
unsigned int nPortIndex;
|
||||
|
||||
DEBUG_PRINT_LOW("In for encoder free_buffer");
|
||||
auto_lock l(m_buf_lock);
|
||||
if (port == PORT_INDEX_OUT) { //client called freebuffer, clearing client buffer bitmask right away to avoid use after free
|
||||
nPortIndex = buffer - (OMX_BUFFERHEADERTYPE*)m_out_mem_ptr;
|
||||
if(BITMASK_PRESENT(&m_client_out_bm_count, nPortIndex))
|
||||
BITMASK_CLEAR(&m_client_out_bm_count,nPortIndex);
|
||||
} else if (port == PORT_INDEX_IN) {
|
||||
nPortIndex = buffer - (meta_mode_enable?meta_buffer_hdr:m_inp_mem_ptr);
|
||||
if(BITMASK_PRESENT(&m_client_in_bm_count, nPortIndex))
|
||||
BITMASK_CLEAR(&m_client_in_bm_count,nPortIndex);
|
||||
}
|
||||
|
||||
if (m_state == OMX_StateIdle &&
|
||||
(BITMASK_PRESENT(&m_flags ,OMX_COMPONENT_LOADING_PENDING))) {
|
||||
DEBUG_PRINT_LOW(" free buffer while Component in Loading pending");
|
||||
|
@ -3730,7 +3712,6 @@ OMX_ERRORTYPE omx_video::free_buffer(OMX_IN OMX_HANDLETYPE hComp,
|
|||
nPortIndex, (unsigned int)m_sOutPortDef.nBufferCountActual);
|
||||
if (nPortIndex < m_sOutPortDef.nBufferCountActual &&
|
||||
BITMASK_PRESENT(&m_out_bm_count, nPortIndex)) {
|
||||
auto_lock l(m_buf_lock);
|
||||
// Clear the bit associated with it.
|
||||
BITMASK_CLEAR(&m_out_bm_count,nPortIndex);
|
||||
m_sOutPortDef.bPopulated = OMX_FALSE;
|
||||
|
@ -4010,9 +3991,9 @@ OMX_ERRORTYPE omx_video::empty_this_buffer_proxy(OMX_IN OMX_HANDLETYPE hComp,
|
|||
{
|
||||
DEBUG_PRINT_LOW("Heap UseBuffer case, so memcpy the data");
|
||||
|
||||
auto_lock l(m_buf_lock);
|
||||
auto_lock l(m_lock);
|
||||
pmem_data_buf = (OMX_U8 *)m_pInput_pmem[nBufIndex].buffer;
|
||||
if (pmem_data_buf && BITMASK_PRESENT(&m_client_in_bm_count, nBufIndex)) {
|
||||
if (pmem_data_buf && BITMASK_PRESENT(&m_inp_bm_count, nBufIndex)) {
|
||||
memcpy (pmem_data_buf, (buffer->pBuffer + buffer->nOffset),
|
||||
buffer->nFilledLen);
|
||||
}
|
||||
|
|
|
@ -2361,15 +2361,11 @@ OMX_ERRORTYPE omx_venc::component_deinit(OMX_IN OMX_HANDLETYPE hComp)
|
|||
DEBUG_PRINT_ERROR("WARNING:Rxd DeInit,OMX not in LOADED state %d",\
|
||||
m_state);
|
||||
}
|
||||
|
||||
auto_lock l(m_buf_lock);
|
||||
if (m_out_mem_ptr) {
|
||||
DEBUG_PRINT_LOW("Freeing the Output Memory");
|
||||
for (i=0; i< m_sOutPortDef.nBufferCountActual; i++ ) {
|
||||
if (BITMASK_PRESENT(&m_out_bm_count, i)) {
|
||||
BITMASK_CLEAR(&m_out_bm_count, i);
|
||||
if (BITMASK_PRESENT(&m_client_out_bm_count, i))
|
||||
BITMASK_CLEAR(&m_client_out_bm_count, i);
|
||||
free_output_buffer (&m_out_mem_ptr[i]);
|
||||
}
|
||||
|
||||
|
@ -2391,8 +2387,6 @@ OMX_ERRORTYPE omx_venc::component_deinit(OMX_IN OMX_HANDLETYPE hComp)
|
|||
for (i=0; i<m_sInPortDef.nBufferCountActual; i++ ) {
|
||||
if (BITMASK_PRESENT(&m_inp_bm_count, i)) {
|
||||
BITMASK_CLEAR(&m_inp_bm_count, i);
|
||||
if (BITMASK_PRESENT(&m_client_in_bm_count, i))
|
||||
BITMASK_CLEAR(&m_client_in_bm_count, i);
|
||||
free_input_buffer (&m_inp_mem_ptr[i]);
|
||||
}
|
||||
|
||||
|
@ -2712,17 +2706,10 @@ int omx_venc::async_message_process (void *context, void* message)
|
|||
OMX_COMPONENT_GENERATE_EBD);
|
||||
break;
|
||||
case VEN_MSG_OUTPUT_BUFFER_DONE:
|
||||
{
|
||||
omxhdr = (OMX_BUFFERHEADERTYPE*)m_sVenc_msg->buf.clientdata;
|
||||
OMX_U32 bufIndex = (OMX_U32)(omxhdr - omx->m_out_mem_ptr);
|
||||
|
||||
if ( (omxhdr != NULL) &&
|
||||
(bufIndex < 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;
|
||||
}
|
||||
((OMX_U32)(omxhdr - omx->m_out_mem_ptr) < omx->m_sOutPortDef.nBufferCountActual)) {
|
||||
if (!omx->is_secure_session() && (m_sVenc_msg->buf.len <= omxhdr->nAllocLen)) {
|
||||
omxhdr->nFilledLen = m_sVenc_msg->buf.len;
|
||||
omxhdr->nOffset = m_sVenc_msg->buf.offset;
|
||||
|
@ -2731,8 +2718,7 @@ int omx_venc::async_message_process (void *context, void* message)
|
|||
omxhdr->nFlags = m_sVenc_msg->buf.flags;
|
||||
|
||||
/*Use buffer case*/
|
||||
if (BITMASK_PRESENT(&(omx->m_client_out_bm_count), bufIndex) &&
|
||||
omx->output_use_buffer && !omx->m_use_output_pmem && !omx->is_secure_session()) {
|
||||
if (omx->output_use_buffer && !omx->m_use_output_pmem && !omx->is_secure_session()) {
|
||||
DEBUG_PRINT_LOW("memcpy() for o/p Heap UseBuffer");
|
||||
memcpy(omxhdr->pBuffer,
|
||||
(m_sVenc_msg->buf.ptrbuffer),
|
||||
|
@ -2766,7 +2752,6 @@ int omx_venc::async_message_process (void *context, void* message)
|
|||
omx->post_event ((unsigned long)omxhdr,m_sVenc_msg->statuscode,
|
||||
OMX_COMPONENT_GENERATE_FBD);
|
||||
break;
|
||||
}
|
||||
case VEN_MSG_NEED_OUTPUT_BUFFER:
|
||||
//TBD what action needs to be done here??
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue