X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Finvert.c;h=33b2884e08b8495d788fff7e0d49de624d70d09a;hb=2d55ac821c1b75407cece163e9e20c19b49e4212;hp=8fcbe6ced655f22f154b720ed9219846b04262cb;hpb=906b68fe0317ff981addd5e9bfe4a5fc5efde6c3;p=vlc diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c index 8fcbe6ced6..33b2884e08 100644 --- a/modules/video_filter/invert.c +++ b/modules/video_filter/invert.c @@ -1,7 +1,7 @@ /***************************************************************************** * invert.c : Invert video plugin for vlc ***************************************************************************** - * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN + * Copyright (C) 2000-2006 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -18,64 +18,43 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "filter_common.h" +#include +#include + +#include +#include "filter_picture.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Create ( vlc_object_t * ); -static void Destroy ( vlc_object_t * ); - -static int Init ( vout_thread_t * ); -static void End ( vout_thread_t * ); -static void Render ( vout_thread_t *, picture_t * ); +static int Create ( vlc_object_t * ); +static void Destroy ( vlc_object_t * ); -static int SendEvents( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +static picture_t *Filter( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("Invert video filter") ); - set_shortname( N_("Color inversion" )); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - set_capability( "video filter", 0 ); - add_shortcut( "invert" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); - -/***************************************************************************** - * vout_sys_t: Invert video output method descriptor - ***************************************************************************** - * This structure is part of the video output thread descriptor. - * It describes the Invert specific properties of an output thread. - *****************************************************************************/ -struct vout_sys_t -{ - vout_thread_t *p_vout; -}; - -/***************************************************************************** - * Control: control facility for the vout (forwards to child vout) - *****************************************************************************/ -static int Control( vout_thread_t *p_vout, int i_query, va_list args ) -{ - return vout_vaControl( p_vout->p_sys->p_vout, i_query, args ); -} +vlc_module_begin () + set_description( N_("Invert video filter") ) + set_shortname( N_("Color inversion" )) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter2", 0 ) + add_shortcut( "invert" ) + set_callbacks( Create, Destroy ) +vlc_module_end () /***************************************************************************** * Create: allocates Invert video thread output method @@ -84,81 +63,13 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) *****************************************************************************/ static int Create( vlc_object_t *p_this ) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; + filter_t *p_filter = (filter_t *)p_this; - /* Allocate structure */ - p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); - if( p_vout->p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); - return VLC_ENOMEM; - } - - p_vout->pf_init = Init; - p_vout->pf_end = End; - p_vout->pf_manage = NULL; - p_vout->pf_render = Render; - p_vout->pf_display = NULL; - p_vout->pf_control = Control; + p_filter->pf_video_filter = Filter; return VLC_SUCCESS; } -/***************************************************************************** - * Init: initialize Invert video thread output method - *****************************************************************************/ -static int Init( vout_thread_t *p_vout ) -{ - int i_index; - picture_t *p_pic; - - I_OUTPUTPICTURES = 0; - - /* Initialize the output structure */ - p_vout->output.i_chroma = p_vout->render.i_chroma; - p_vout->output.i_width = p_vout->render.i_width; - p_vout->output.i_height = p_vout->render.i_height; - p_vout->output.i_aspect = p_vout->render.i_aspect; - - /* Try to open the real video output */ - msg_Dbg( p_vout, "spawning the real video output" ); - - p_vout->p_sys->p_vout = vout_Create( p_vout, - p_vout->render.i_width, p_vout->render.i_height, - p_vout->render.i_chroma, p_vout->render.i_aspect ); - - /* Everything failed */ - if( p_vout->p_sys->p_vout == NULL ) - { - msg_Err( p_vout, "can't open vout, aborting" ); - - return VLC_EGENERIC; - } - - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - - ADD_PARENT_CALLBACKS( SendEventsToChild ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * End: terminate Invert video thread output method - *****************************************************************************/ -static void End( vout_thread_t *p_vout ) -{ - int i_index; - - /* Free the fake output buffers we allocated */ - for( i_index = I_OUTPUTPICTURES ; i_index ; ) - { - i_index--; - free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); - } -} - /***************************************************************************** * Destroy: destroy Invert video thread output method ***************************************************************************** @@ -166,18 +77,7 @@ static void End( vout_thread_t *p_vout ) *****************************************************************************/ static void Destroy( vlc_object_t *p_this ) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; - - if( p_vout->p_sys->p_vout ) - { - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - vlc_object_detach( p_vout->p_sys->p_vout ); - vout_Destroy( p_vout->p_sys->p_vout ); - } - - DEL_PARENT_CALLBACKS( SendEventsToChild ); - - free( p_vout->p_sys ); + (void)p_this; } /***************************************************************************** @@ -187,26 +87,36 @@ static void Destroy( vlc_object_t *p_this ) * until it is displayed and switch the two rendering buffers, preparing next * frame. *****************************************************************************/ -static void Render( vout_thread_t *p_vout, picture_t *p_pic ) +static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; int i_index; + int i_planes; - /* This is a new frame. Get a structure from the video_output. */ - while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) ) - == NULL ) + if( !p_pic ) return NULL; + + p_outpic = filter_NewPicture( p_filter ); + if( !p_outpic ) { - if( p_vout->b_die || p_vout->b_error ) - { - return; - } - msleep( VOUT_OUTMEM_SLEEP ); + msg_Warn( p_filter, "can't get output picture" ); + picture_Release( p_pic ); + return NULL; } - vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); - vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); + if( p_pic->format.i_chroma == VLC_CODEC_YUVA ) + { + /* We don't want to invert the alpha plane */ + i_planes = p_pic->i_planes - 1; + vlc_memcpy( + p_outpic->p[A_PLANE].p_pixels, p_pic->p[A_PLANE].p_pixels, + p_pic->p[A_PLANE].i_pitch * p_pic->p[A_PLANE].i_lines ); + } + else + { + i_planes = p_pic->i_planes; + } - for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) + for( i_index = 0 ; i_index < i_planes ; i_index++ ) { uint8_t *p_in, *p_in_end, *p_line_end, *p_out; @@ -225,7 +135,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) p_in64 = (uint64_t*)p_in; p_out64 = (uint64_t*)p_out; - for( ; (ptrdiff_t)p_in64 < (ptrdiff_t)p_line_end ; ) + while( p_in64 < (uint64_t *)p_line_end ) { /* Do 64 pixels at a time */ *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++; @@ -250,29 +160,5 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) } } - vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); - - vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); -} - -/***************************************************************************** - * SendEvents: forward mouse and keyboard events to the parent p_vout - *****************************************************************************/ -static int SendEvents( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - var_Set( (vlc_object_t *)p_data, psz_var, newval ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * SendEventsToChild: forward events to the child/children vout - *****************************************************************************/ -static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - var_Set( p_vout->p_sys->p_vout, psz_var, newval ); - return VLC_SUCCESS; + return CopyInfoAndRelease( p_outpic, p_pic ); }