X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fpsychedelic.c;h=cbca3785834c12bd9a08f641848763d7f81d20c3;hb=0c1a0ba99505bb17b86c1cbc02807c11453ec126;hp=7a9540acb16c1bfb6e50f8908b9e783767497412;hpb=5d3c921b102e46e416c8e1169d8ac604a8654ac1;p=vlc diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index 7a9540acb1..cbca378583 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -1,25 +1,25 @@ /***************************************************************************** - * Psychedelic.c : Psychedelic video effect plugin for vlc + * psychedelic.c : Psychedelic video effect plugin for vlc ***************************************************************************** - * Copyright (C) 2000-2006 the VideoLAN team + * Copyright (C) 2000-2006 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * 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. *****************************************************************************/ /***************************************************************************** @@ -35,8 +35,8 @@ #include #include -#include "vlc_filter.h" -#include "vlc_image.h" +#include +#include #include "filter_picture.h" /***************************************************************************** @@ -50,19 +50,19 @@ static picture_t *Filter( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Psychedelic video filter") ); - set_shortname( N_( "Psychedelic" )); - set_capability( "video filter2", 0 ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); +vlc_module_begin () + set_description( N_("Psychedelic video filter") ) + set_shortname( N_( "Psychedelic" )) + set_capability( "video filter2", 0 ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) - add_shortcut( "psychedelic" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + add_shortcut( "psychedelic" ) + set_callbacks( Create, Destroy ) +vlc_module_end () /***************************************************************************** - * vout_sys_t: Distort video output method descriptor + * filter_sys_t: Distort video output method descriptor ***************************************************************************** * This structure is part of the video output thread descriptor. * It describes the Distort specific properties of an output thread. @@ -84,6 +84,13 @@ static int Create( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + const vlc_fourcc_t fourcc = p_filter->fmt_in.video.i_chroma; + const vlc_chroma_description_t *p_chroma = vlc_fourcc_GetChromaDescription( fourcc ); + if( !p_chroma || p_chroma->plane_count != 3 || p_chroma->pixel_size != 1 ) { + msg_Err( p_filter, "Unsupported chroma (%4.4s)", (char*)&fourcc ); + return VLC_EGENERIC; + } + /* Allocate structure */ p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_filter->p_sys == NULL ) @@ -142,10 +149,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) 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" ); picture_Release( p_pic ); return NULL; } @@ -158,10 +164,10 @@ 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++) { - vlc_memset( + memset( p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch, u, p_outpic->p[U_PLANE].i_pitch ); - vlc_memset( + 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 ) @@ -175,13 +181,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } /* luminance */ - 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 ); + plane_CopyPixels( &p_outpic->p[Y_PLANE], &p_pic->p[Y_PLANE] ); /* image visualization */ fmt_out = p_filter->fmt_out.video; fmt_out.i_width = p_filter->fmt_out.video.i_width*p_filter->p_sys->scale/150; fmt_out.i_height = p_filter->fmt_out.video.i_height*p_filter->p_sys->scale/150; + fmt_out.i_visible_width = fmt_out.i_width; + fmt_out.i_visible_height = fmt_out.i_height; p_converted = image_Convert( p_filter->p_sys->p_image, p_pic, &(p_pic->format), &fmt_out );