X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fpsychedelic.c;h=88a2e3515f1d89167bcd34037a87d3f9c5e59788;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=c7fcd36e4287ae036912c21ea244fa3031c41077;hpb=2f662e486a43d851ea27deb58d230d98278fecfc;p=vlc diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index c7fcd36e42..88a2e3515f 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -25,16 +25,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include /* sin(), cos() */ -#include -#include +#include +#include #include "vlc_filter.h" #include "vlc_image.h" +#include "filter_picture.h" /***************************************************************************** * Local prototypes @@ -48,11 +51,11 @@ static picture_t *Filter( filter_t *, picture_t * ); * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("Psychedelic video filter") ); + set_description( N_("Psychedelic video filter") ); set_shortname( N_( "Psychedelic" )); set_capability( "video filter2", 0 ); set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER2 ); + set_subcategory( SUBCAT_VIDEO_VFILTER ); add_shortcut( "psychedelic" ); set_callbacks( Create, Destroy ); @@ -84,10 +87,7 @@ static int Create( vlc_object_t *p_this ) /* Allocate structure */ p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_filter->p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } p_filter->pf_video_filter = Filter; @@ -136,17 +136,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) uint8_t u,v; picture_t *p_converted; - video_format_t fmt_out = {0}; + video_format_t fmt_out; + memset( &fmt_out, 0, sizeof(video_format_t) ); fmt_out.p_palette = NULL; 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; } @@ -158,9 +157,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) v = p_filter->p_sys->v; for( y = 0; yp[U_PLANE].i_lines; y++) { - memset( p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch, + vlc_memset( + p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch, u, p_outpic->p[U_PLANE].i_pitch ); - memset( p_outpic->p[V_PLANE].p_pixels+y*p_outpic->p[V_PLANE].i_pitch, + vlc_memset( + p_outpic->p[V_PLANE].p_pixels+y*p_outpic->p[V_PLANE].i_pitch, v, p_outpic->p[V_PLANE].i_pitch ); if( v == 0 && u != 0 ) u --; @@ -173,8 +174,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } /* luminance */ - p_filter->p_vlc->pf_memcpy( - p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels, p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); /* image visualization */ @@ -184,26 +184,33 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_converted = image_Convert( p_filter->p_sys->p_image, p_pic, &(p_pic->format), &fmt_out ); + if( p_converted ) + { #define copyimage( plane, b ) \ - for( y=0; yp[plane].i_visible_lines; y++) { \ - for( x=0; xp[plane].i_visible_pitch; x++) { \ - int nx, ny; \ - if( p_filter->p_sys->yinc == 1 ) \ - ny= y; \ - else \ - ny = p_converted->p[plane].i_visible_lines-y; \ - if( p_filter->p_sys->xinc == 1 ) \ - nx = x; \ - else \ - nx = p_converted->p[plane].i_visible_pitch-x; \ - p_outpic->p[plane].p_pixels[(p_filter->p_sys->x*b+nx)+(ny+p_filter->p_sys->y*b)*p_outpic->p[plane].i_pitch ] = p_converted->p[plane].p_pixels[y*p_converted->p[plane].i_pitch+x]; \ - } } - copyimage( Y_PLANE, 2 ); - copyimage( U_PLANE, 1 ); - copyimage( V_PLANE, 1 ); + for( y=0; yp[plane].i_visible_lines; y++) { \ + for( x=0; xp[plane].i_visible_pitch; x++) { \ + int nx, ny; \ + if( p_filter->p_sys->yinc == 1 ) \ + ny= y; \ + else \ + ny = p_converted->p[plane].i_visible_lines-y; \ + if( p_filter->p_sys->xinc == 1 ) \ + nx = x; \ + else \ + nx = p_converted->p[plane].i_visible_pitch-x; \ + p_outpic->p[plane].p_pixels[(p_filter->p_sys->x*b+nx)+(ny+p_filter->p_sys->y*b)*p_outpic->p[plane].i_pitch ] = p_converted->p[plane].p_pixels[y*p_converted->p[plane].i_pitch+x]; \ + } } + copyimage( Y_PLANE, 2 ); + copyimage( U_PLANE, 1 ); + copyimage( V_PLANE, 1 ); #undef copyimage - p_converted->pf_release( p_converted ); + picture_Release( p_converted ); + } + else + { + msg_Err( p_filter, "Image scaling failed miserably." ); + } p_filter->p_sys->x += p_filter->p_sys->xinc; p_filter->p_sys->y += p_filter->p_sys->yinc; @@ -241,14 +248,5 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_filter->p_sys->v += 1; } - p_outpic->date = p_pic->date; - p_outpic->b_force = p_pic->b_force; - p_outpic->i_nb_fields = p_pic->i_nb_fields; - p_outpic->b_progressive = p_pic->b_progressive; - p_outpic->b_top_field_first = p_pic->b_top_field_first; - - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); - - return p_outpic; + return CopyInfoAndRelease( p_outpic, p_pic ); }