X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Frotate.c;h=eabdfcb9e2a75da1aab108b463ec01006d1f434b;hb=f741dd1b7e5499c311bb0e91569e5d8f44835778;hp=ff058eb72b89c5826ec26fc7822605e72fae65f4;hpb=036a6a2e9efba5173b5695c44f34b0f01a478d58;p=vlc diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index ff058eb72b..eabdfcb9e2 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -34,7 +34,7 @@ #include #include -#include "vlc_filter.h" +#include #include "filter_picture.h" /***************************************************************************** @@ -85,9 +85,9 @@ static const char *const ppsz_filter_options[] = { *****************************************************************************/ struct filter_sys_t { - int i_angle; - int i_cos; - int i_sin; + vlc_spinlock_t lock; + int i_cos; + int i_sin; }; static inline void cache_trigo( int i_angle, int *i_sin, int *i_cos ) @@ -122,7 +122,7 @@ static int Create( vlc_object_t *p_this ) break; default: - msg_Err( p_filter, "Unsupported input chroma (%4s)", + msg_Err( p_filter, "Unsupported input chroma (%4.4s)", (char*)&(p_filter->fmt_in.video.i_chroma) ); return VLC_EGENERIC; } @@ -136,16 +136,16 @@ static int Create( vlc_object_t *p_this ) config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options, p_filter->p_cfg ); - p_sys->i_angle = var_CreateGetIntegerCommand( p_filter, - FILTER_PREFIX "angle" ) * 10; + int i_angle = var_CreateGetIntegerCommand( p_filter, + FILTER_PREFIX "angle" ) * 10; + cache_trigo( i_angle, &p_sys->i_sin, &p_sys->i_cos ); var_Create( p_filter, FILTER_PREFIX "deciangle", VLC_VAR_INTEGER|VLC_VAR_ISCOMMAND ); + vlc_spin_init( &p_sys->lock ); var_AddCallback( p_filter, FILTER_PREFIX "angle", RotateCallback, p_sys ); var_AddCallback( p_filter, FILTER_PREFIX "deciangle", PreciseRotateCallback, p_sys ); - cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos ); - return VLC_SUCCESS; } @@ -159,7 +159,7 @@ static void Destroy( vlc_object_t *p_this ) var_DelCallback( p_filter, FILTER_PREFIX "angle", RotateCallback, p_filter->p_sys ); var_DelCallback( p_filter, FILTER_PREFIX "deciangle", PreciseRotateCallback, p_filter->p_sys ); - + vlc_spin_destroy( &p_filter->p_sys->lock ); free( p_filter->p_sys ); } @@ -170,8 +170,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; filter_sys_t *p_sys = p_filter->p_sys; - int i_plane; - const int i_sin = p_sys->i_sin, i_cos = p_sys->i_cos; if( !p_pic ) return NULL; @@ -182,14 +180,19 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) return NULL; } - for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) + vlc_spin_lock( &p_sys->lock ); + const int i_sin = p_sys->i_sin; + const int i_cos = p_sys->i_cos; + vlc_spin_unlock( &p_sys->lock ); + + for( int i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) { const int i_visible_lines = p_pic->p[i_plane].i_visible_lines; const int i_visible_pitch = p_pic->p[i_plane].i_visible_pitch; const int i_pitch = p_pic->p[i_plane].i_pitch; const int i_hidden_pitch = i_pitch - i_visible_pitch; - const int i_aspect = ( i_visible_lines * p_pic->p[Y_PLANE].i_visible_pitch ) / ( p_pic->p[Y_PLANE].i_visible_lines * i_visible_pitch ); + const int i_aspect = __MAX( 1, ( i_visible_lines * p_pic->p[Y_PLANE].i_visible_pitch ) / ( p_pic->p[Y_PLANE].i_visible_lines * i_visible_pitch )); /* = 2 for U and V planes in YUV 4:2:2, = 1 otherwise */ const int i_line_center = i_visible_lines>>1; @@ -291,7 +294,6 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; filter_sys_t *p_sys = p_filter->p_sys; - const int i_sin = p_sys->i_sin, i_cos = p_sys->i_cos; if( !p_pic ) return NULL; @@ -300,7 +302,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset, &i_u_offset, &i_v_offset ) != VLC_SUCCESS ) { - msg_Warn( p_filter, "Unsupported input chroma (%4s)", + msg_Warn( p_filter, "Unsupported input chroma (%4.4s)", (char*)&(p_pic->format.i_chroma) ); picture_Release( p_pic ); return NULL; @@ -328,6 +330,11 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) const int i_line_center = i_visible_lines>>1; const int i_col_center = i_visible_pitch>>1; + vlc_spin_lock( &p_sys->lock ); + const int i_sin = p_sys->i_sin; + const int i_cos = p_sys->i_cos; + vlc_spin_unlock( &p_sys->lock ); + int i_col, i_line; for( i_line = 0; i_line < i_visible_lines; i_line++ ) { @@ -390,11 +397,9 @@ static int RotateCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); - filter_sys_t *p_sys = (filter_sys_t *)p_data; - p_sys->i_angle = newval.i_int*10; - cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos ); - return VLC_SUCCESS; + oldval.i_int *= 10; + newval.i_int *= 10; + return PreciseRotateCallback( p_this, psz_var, oldval, newval, p_data ); } static int PreciseRotateCallback( vlc_object_t *p_this, char const *psz_var, @@ -403,7 +408,12 @@ static int PreciseRotateCallback( vlc_object_t *p_this, char const *psz_var, { VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); filter_sys_t *p_sys = (filter_sys_t *)p_data; - p_sys->i_angle = newval.i_int; - cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos ); + int i_sin, i_cos; + + cache_trigo( newval.i_int, &i_sin, &i_cos ); + vlc_spin_lock( &p_sys->lock ); + p_sys->i_sin = i_sin; + p_sys->i_cos = i_cos; + vlc_spin_unlock( &p_sys->lock ); return VLC_SUCCESS; }