Skip to content

V
vlc-2-2
Commit 5e61e248 authored by Pierre Ynard's avatar Pierre Ynard
Browse files
Options

rotate: don't branch inside spinlock

parent 4a8d3884
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 10 deletions
modules/video_filter/rotate.c
View file @ 5e61e248
...@@ -209,6 +209,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -209,6 +209,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return NULL; return NULL;
} }
int s, c;
if( p_sys->p_motion != NULL ) if( p_sys->p_motion != NULL )
{ {
int i_angle = motion_get_angle( p_sys->p_motion ) / 2; int i_angle = motion_get_angle( p_sys->p_motion ) / 2;
...@@ -217,15 +218,20 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -217,15 +218,20 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
p_sys->i_angle = i_angle; p_sys->i_angle = i_angle;
cache_trigo( i_angle, &p_sys->i_sin, &p_sys->i_cos ); cache_trigo( i_angle, &p_sys->i_sin, &p_sys->i_cos );
} }
s = p_sys->i_sin;
c = p_sys->i_cos;
} }
else else
{
vlc_spin_lock( &p_sys->lock ); vlc_spin_lock( &p_sys->lock );
s = p_sys->i_sin;
const int i_sin = p_sys->i_sin; c = p_sys->i_cos;
const int i_cos = p_sys->i_cos;
if( p_sys->p_motion == NULL )
vlc_spin_unlock( &p_sys->lock ); vlc_spin_unlock( &p_sys->lock );
}
const int i_sin = s;
const int i_cos = c;
for( int i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) for( int i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
{ {
...@@ -373,6 +379,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) ...@@ -373,6 +379,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
const int i_line_center = i_visible_lines>>1; const int i_line_center = i_visible_lines>>1;
const int i_col_center = i_visible_pitch>>1; const int i_col_center = i_visible_pitch>>1;
int s, c;
if( p_sys->p_motion != NULL ) if( p_sys->p_motion != NULL )
{ {
int i_angle = motion_get_angle( p_sys->p_motion ) / 2; int i_angle = motion_get_angle( p_sys->p_motion ) / 2;
...@@ -381,15 +388,20 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) ...@@ -381,15 +388,20 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
p_sys->i_angle = i_angle; p_sys->i_angle = i_angle;
cache_trigo( i_angle, &p_sys->i_sin, &p_sys->i_cos ); cache_trigo( i_angle, &p_sys->i_sin, &p_sys->i_cos );
} }
s = p_sys->i_sin;
c = p_sys->i_cos;
} }
else else
{
vlc_spin_lock( &p_sys->lock ); vlc_spin_lock( &p_sys->lock );
s = p_sys->i_sin;
const int i_sin = p_sys->i_sin; c = p_sys->i_cos;
const int i_cos = p_sys->i_cos;
if( p_sys->p_motion == NULL )
vlc_spin_unlock( &p_sys->lock ); vlc_spin_unlock( &p_sys->lock );
}
const int i_sin = s;
const int i_cos = c;
int i_col, i_line; int i_col, i_line;
for( i_line = 0; i_line < i_visible_lines; i_line++ ) for( i_line = 0; i_line < i_visible_lines; i_line++ )
......
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