X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Frotate.c;h=54a8bdc4cffa658112454360a17aaa10b2bd3e67;hb=40a2f546e1dca36312916b391f64f96a438f0a37;hp=38f3c062df1ca59e1d15893a4b19fcc561f88f94;hpb=42bb236284b09355d8bfde47fb4915dd1f07aa68;p=vlc diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index 38f3c062df..54a8bdc4cf 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -25,17 +25,16 @@ * Preamble *****************************************************************************/ -#include /* sin(), cos() */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include /* sin(), cos() */ + #include #include -#include -#include "vlc_filter.h" +#include #include "filter_picture.h" /***************************************************************************** @@ -63,19 +62,19 @@ static int PreciseRotateCallback( vlc_object_t *p_this, char const *psz_var, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Rotate video filter") ); - set_shortname( N_( "Rotate" )); - set_capability( "video filter2", 0 ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); +vlc_module_begin () + set_description( N_("Rotate video filter") ) + set_shortname( N_( "Rotate" )) + set_capability( "video filter2", 0 ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) add_integer_with_range( FILTER_PREFIX "angle", 30, 0, 359, NULL, - ANGLE_TEXT, ANGLE_LONGTEXT, false ); + ANGLE_TEXT, ANGLE_LONGTEXT, false ) - add_shortcut( "rotate" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + add_shortcut( "rotate" ) + set_callbacks( Create, Destroy ) +vlc_module_end () static const char *const ppsz_filter_options[] = { "angle", NULL @@ -86,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 ) @@ -137,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; } @@ -157,6 +156,10 @@ static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_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 ); } @@ -167,28 +170,29 @@ 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; - p_outpic = p_filter->pf_vout_buffer_new( p_filter ); + p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) { - msg_Warn( p_filter, "can't get output picture" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( 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; @@ -290,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; @@ -301,17 +304,14 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) { msg_Warn( p_filter, "Unsupported input chroma (%4s)", (char*)&(p_pic->format.i_chroma) ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } - p_outpic = p_filter->pf_vout_buffer_new( p_filter ); + p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) { - msg_Warn( p_filter, "can't get output picture" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } @@ -330,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++ ) { @@ -392,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, @@ -405,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; }