Commit 2ce82a3f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

visual: remove non-sensical code

This mostly reverts commit fc5156cc.
This also fixes a use-after-free bug.
parent ebbe5a5f
...@@ -192,8 +192,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -192,8 +192,6 @@ static int Open( vlc_object_t *p_this )
if( (p_sys->i_height % 2 ) != 0 ) p_sys->i_height--; if( (p_sys->i_height % 2 ) != 0 ) p_sys->i_height--;
if( (p_sys->i_width % 2 ) != 0 ) p_sys->i_width--; if( (p_sys->i_width % 2 ) != 0 ) p_sys->i_width--;
vlc_mutex_init( &p_sys->lock );
p_sys->b_close = false;
p_sys->i_effect = 0; p_sys->i_effect = 0;
p_sys->effect = NULL; p_sys->effect = NULL;
...@@ -321,16 +319,8 @@ static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf ) ...@@ -321,16 +319,8 @@ static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
picture_t *p_outpic; picture_t *p_outpic;
/* First, get a new picture */ /* First, get a new picture */
do while( ( p_outpic = vout_GetPicture( p_sys->p_vout ) ) == NULL )
{
vlc_mutex_lock( &p_sys->lock );
bool close = p_sys->b_close;
vlc_mutex_unlock( &p_sys->lock );
if( close )
return NULL;
msleep( VOUT_OUTMEM_SLEEP ); msleep( VOUT_OUTMEM_SLEEP );
}
while( ( p_outpic = vout_GetPicture( p_sys->p_vout ) ) == NULL);
/* Blank the picture */ /* Blank the picture */
for( int i = 0 ; i < p_outpic->i_planes ; i++ ) for( int i = 0 ; i < p_outpic->i_planes ; i++ )
...@@ -365,10 +355,6 @@ static void Close( vlc_object_t *p_this ) ...@@ -365,10 +355,6 @@ static void Close( vlc_object_t *p_this )
filter_t * p_filter = (filter_t *)p_this; filter_t * p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
vlc_mutex_lock( &p_sys->lock );
p_sys->b_close = true;
vlc_mutex_unlock( &p_sys->lock );
if( p_filter->p_sys->p_vout ) if( p_filter->p_sys->p_vout )
{ {
aout_filter_RequestVout( p_filter, p_filter->p_sys->p_vout, 0 ); aout_filter_RequestVout( p_filter, p_filter->p_sys->p_vout, 0 );
...@@ -402,6 +388,4 @@ static void Close( vlc_object_t *p_this ) ...@@ -402,6 +388,4 @@ static void Close( vlc_object_t *p_this )
free( p_sys->effect ); free( p_sys->effect );
free( p_filter->p_sys ); free( p_filter->p_sys );
vlc_mutex_destroy( &p_sys->lock );
} }
...@@ -64,8 +64,6 @@ typedef struct ...@@ -64,8 +64,6 @@ typedef struct
struct filter_sys_t struct filter_sys_t
{ {
vout_thread_t* p_vout; vout_thread_t* p_vout;
vlc_mutex_t lock;
bool b_close;
int i_width; int i_width;
int i_height; int i_height;
......
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