vlc | branch: master | Thomas Guillem <[email protected]> | Tue Dec 1 17:58:34 2015 +0100| [abb3f8383aef5d8ed767ff947aa0c6f2074200d1] | committer: Thomas Guillem
omxil: HwBuffer: fix double lock Regression from 890f8e0f98ffb9bb04e33bc7adc09d7644882149 ReleasePicture is already locked since it's now called from AndroidOpaquePicture_DetachDecoder. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=abb3f8383aef5d8ed767ff947aa0c6f2074200d1 --- modules/codec/omxil/omxil.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c index 979a151..3454917 100644 --- a/modules/codec/omxil/omxil.c +++ b/modules/codec/omxil/omxil.c @@ -2561,7 +2561,6 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index, OmxPort *p_port = &p_sys->out; void *p_handle; - HWBUFFER_LOCK( p_port ); p_handle = p_port->pp_buffers[i_index]->pBuffer; OMX_DBG( "DisplayBuffer: %s %p", @@ -2570,7 +2569,7 @@ static void ReleasePicture( decoder_t *p_dec, unsigned int i_index, if( !p_handle ) { msg_Err( p_dec, "DisplayBuffer: buffer handle invalid" ); - goto end; + return; } if( b_render ) @@ -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_BROADCAST( p_port ); - -end: - - HWBUFFER_UNLOCK( p_port ); } #endif // USE_IOMX _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
