X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmotionblur.c;h=4dedc12dabde93986e8ac0d887c828c31dd282f6;hb=001e2bb351f6b386d540a05bd0b688934d1009b4;hp=40c7044d3b84e708f7d49ab43435c1bbce628c3c;hpb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;p=vlc diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 40c7044d3b..4dedc12dab 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -1,25 +1,25 @@ /***************************************************************************** - * motion_blur.c : motion blur filter for vlc + * motionblur.c : motion blur filter for vlc ***************************************************************************** - * Copyright (C) 2000, 2001, 2002, 2003 the VideoLAN team + * Copyright (C) 2000, 2001, 2002, 2003 VLC authors and VideoLAN * $Id$ * * Authors: Sigmund Augdal Helberg * Antoine Cellerier * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -33,8 +33,8 @@ #include #include #include -#include #include +#include #include "filter_picture.h" /***************************************************************************** @@ -44,7 +44,6 @@ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); static picture_t *Filter ( filter_t *, picture_t * ); static void RenderBlur ( filter_sys_t *, picture_t *, picture_t * ); -static void Copy ( filter_t *, picture_t * ); static int MotionBlurCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -63,7 +62,7 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VFILTER ) - add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL, + add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, FACTOR_TEXT, FACTOR_LONGTEXT, false ) add_shortcut( "blur" ) @@ -80,10 +79,9 @@ static const char *const ppsz_filter_options[] = { *****************************************************************************/ struct filter_sys_t { - int i_factor; - - uint8_t **pp_planes; - int i_planes; + picture_t *p_tmp; + bool b_first; + atomic_int i_factor; }; /***************************************************************************** @@ -93,23 +91,34 @@ static int Create( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + const vlc_chroma_description_t *p_chroma = + vlc_fourcc_GetChromaDescription( p_filter->fmt_in.video.i_chroma ); + if( p_chroma == NULL || p_chroma->plane_count == 0 ) + return VLC_EGENERIC; + /* Allocate structure */ p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_filter->p_sys == NULL ) return VLC_ENOMEM; + p_filter->p_sys->p_tmp = picture_NewFromFormat( &p_filter->fmt_in.video ); + if( !p_filter->p_sys->p_tmp ) + { + free( p_filter->p_sys ); + return VLC_ENOMEM; + } + p_filter->p_sys->b_first = true; + p_filter->pf_video_filter = Filter; config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options, p_filter->p_cfg ); - p_filter->p_sys->i_factor = - var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "factor" ); + atomic_init( &p_filter->p_sys->i_factor, + var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "factor" ) ); var_AddCallback( p_filter, FILTER_PREFIX "factor", MotionBlurCallback, p_filter->p_sys ); - p_filter->p_sys->pp_planes = NULL; - p_filter->p_sys->i_planes = 0; return VLC_SUCCESS; } @@ -121,9 +130,10 @@ static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; - while( p_filter->p_sys->i_planes-- ) - free( p_filter->p_sys->pp_planes[p_filter->p_sys->i_planes] ); - free( p_filter->p_sys->pp_planes ); + var_DelCallback( p_filter, FILTER_PREFIX "factor", + MotionBlurCallback, p_filter->p_sys ); + + picture_Release( p_filter->p_sys->p_tmp ); free( p_filter->p_sys ); } @@ -144,24 +154,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) return NULL; } - if( !p_sys->pp_planes ) + if( p_sys->b_first ) { - /* initialise our picture buffer */ - int i_plane; - p_sys->i_planes = p_pic->i_planes; - p_sys->pp_planes = - (uint8_t**)malloc( p_sys->i_planes * sizeof( uint8_t * ) ); - for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) - { - p_sys->pp_planes[i_plane] = (uint8_t*)malloc( - p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines ); - } - Copy( p_filter, p_pic ); + picture_CopyPixels( p_sys->p_tmp, p_pic ); + p_sys->b_first = false; } /* Get a new picture */ RenderBlur( p_sys, p_pic, p_outpic ); - Copy( p_filter, p_outpic ); + + picture_CopyPixels( p_sys->p_tmp, p_outpic ); return CopyInfoAndRelease( p_outpic, p_pic ); } @@ -173,19 +175,19 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic, picture_t *p_outpic ) { int i_plane; - int i_oldfactor = p_sys->i_factor; + const int i_oldfactor = atomic_load( &p_sys->i_factor ); int i_newfactor = 128 - i_oldfactor; + for( i_plane = 0; i_plane < p_outpic->i_planes; i_plane++ ) { uint8_t *p_old, *p_new, *p_out, *p_out_end, *p_out_line_end; - const int i_pitch = p_outpic->p[i_plane].i_pitch; const int i_visible_pitch = p_outpic->p[i_plane].i_visible_pitch; const int i_visible_lines = p_outpic->p[i_plane].i_visible_lines; p_out = p_outpic->p[i_plane].p_pixels; p_new = p_newpic->p[i_plane].p_pixels; - p_old = p_sys->pp_planes[i_plane]; - p_out_end = p_out + i_pitch * i_visible_lines; + p_old = p_sys->p_tmp->p[i_plane].p_pixels; + p_out_end = p_out + p_outpic->p[i_plane].i_pitch * i_visible_lines; while ( p_out < p_out_end ) { p_out_line_end = p_out + i_visible_pitch; @@ -196,31 +198,20 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic, ((*p_new++) * i_newfactor)) >> 7; } - p_old += i_pitch - i_visible_pitch; - p_new += i_pitch - i_visible_pitch; - p_out += i_pitch - i_visible_pitch; + p_old += p_sys->p_tmp->p[i_plane].i_pitch - i_visible_pitch; + p_new += p_newpic->p[i_plane].i_pitch - i_visible_pitch; + p_out += p_outpic->p[i_plane].i_pitch - i_visible_pitch; } } } -static void Copy( filter_t *p_filter, picture_t *p_pic ) -{ - int i_plane; - for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) - { - vlc_memcpy( - p_filter->p_sys->pp_planes[i_plane], p_pic->p[i_plane].p_pixels, - p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines ); - } -} - static int MotionBlurCallback( 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(oldval); + VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); filter_sys_t *p_sys = (filter_sys_t *)p_data; - if( !strcmp( psz_var, FILTER_PREFIX "factor" ) ) - p_sys->i_factor = __MIN( 127, __MAX( 1, newval.i_int ) ); + + atomic_store( &p_sys->i_factor, VLC_CLIP( newval.i_int, 1, 127 ) ); return VLC_SUCCESS; }