Commit abb3f838 authored by Thomas Guillem's avatar Thomas Guillem

omxil: HwBuffer: fix double lock

Regression from 890f8e0f

ReleasePicture is already locked since it's now called from
AndroidOpaquePicture_DetachDecoder.
parent 217a2f8c
...@@ -2561,7 +2561,6 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index, ...@@ -2561,7 +2561,6 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index,
OmxPort *p_port = &p_sys->out; OmxPort *p_port = &p_sys->out;
void *p_handle; void *p_handle;
HWBUFFER_LOCK( p_port );
p_handle = p_port->pp_buffers[i_index]->pBuffer; p_handle = p_port->pp_buffers[i_index]->pBuffer;
OMX_DBG( "DisplayBuffer: %s %p", OMX_DBG( "DisplayBuffer: %s %p",
...@@ -2570,7 +2569,7 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index, ...@@ -2570,7 +2569,7 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index,
if( !p_handle ) if( !p_handle )
{ {
msg_Err( p_dec, "DisplayBuffer: buffer handle invalid" ); msg_Err( p_dec, "DisplayBuffer: buffer handle invalid" );
goto end; return;
} }
if( b_render ) if( b_render )
...@@ -2580,10 +2579,6 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index, ...@@ -2580,10 +2579,6 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index,
HwBuffer_ChangeState( p_dec, p_port, i_index, BUF_STATE_NOT_OWNED ); HwBuffer_ChangeState( p_dec, p_port, i_index, BUF_STATE_NOT_OWNED );
HWBUFFER_BROADCAST( p_port ); HWBUFFER_BROADCAST( p_port );
end:
HWBUFFER_UNLOCK( p_port );
} }
#endif // USE_IOMX #endif // USE_IOMX
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment