X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Finvert.c;h=1700c1d7eb7fab4234a0c8e0722305b228ec4d89;hb=23fe953dbb391d1a20a6b75a79d41ff8a2d77f82;hp=1d9e62d417187d5e8dda65893f44b2d62f3946c4;hpb=f6cf9ef8b887f4ef9a9692603ba9907edfdf9db2;p=vlc diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c index 1d9e62d417..1700c1d7eb 100644 --- a/modules/video_filter/invert.c +++ b/modules/video_filter/invert.c @@ -1,8 +1,8 @@ /***************************************************************************** * invert.c : Invert video plugin for vlc ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN - * $Id: invert.c,v 1.2 2002/11/23 02:40:30 sam Exp $ + * Copyright (C) 2000-2006 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 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 @@ -18,36 +18,41 @@ * * 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 +#include +#include -#include "filter_common.h" +#include "vlc_filter.h" +#include "filter_picture.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Create ( vlc_object_t * ); -static void Destroy ( vlc_object_t * ); +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 picture_t *Filter( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("invert video module") ); - set_capability( "video filter", 0 ); + 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(); @@ -58,9 +63,8 @@ vlc_module_end(); * This structure is part of the video output thread descriptor. * It describes the Invert specific properties of an output thread. *****************************************************************************/ -struct vout_sys_t +struct filter_sys_t { - vout_thread_t *p_vout; }; /***************************************************************************** @@ -70,75 +74,16 @@ struct vout_sys_t *****************************************************************************/ 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( 1 ); - } + p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); + if( p_filter->p_sys == NULL ) + 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_filter->pf_video_filter = Filter; - return( 0 ); -} - -/***************************************************************************** - * 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_CreateThread( 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( 0 ); - } - - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - - return( 0 ); -} - -/***************************************************************************** - * 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 ); - } + return VLC_SUCCESS; } /***************************************************************************** @@ -147,12 +92,10 @@ static void End( vout_thread_t *p_vout ) * Terminate an output method created by InvertCreateOutputMethod *****************************************************************************/ static void Destroy( vlc_object_t *p_this ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - - vout_DestroyThread( p_vout->p_sys->p_vout ); +{ + filter_t *p_filter = (filter_t *)p_this; - free( p_vout->p_sys ); + free( p_filter->p_sys ); } /***************************************************************************** @@ -162,59 +105,78 @@ 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; + + if( !p_pic ) return NULL; - /* 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 ) + 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_FOURCC('Y','U','V','A') ) + { + /* 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++ ) { - u8 *p_in, *p_in_end, *p_out; + uint8_t *p_in, *p_in_end, *p_line_end, *p_out; p_in = p_pic->p[i_index].p_pixels; - p_in_end = p_in - 64 + p_pic->p[i_index].i_lines - * p_pic->p[i_index].i_pitch; + p_in_end = p_in + p_pic->p[i_index].i_visible_lines + * p_pic->p[i_index].i_pitch; p_out = p_outpic->p[i_index].p_pixels; for( ; p_in < p_in_end ; ) { - /* Do 64 pixels at a time */ - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - *((u64*)p_out)++ = ~( *((u64*)p_in)++ ); - } - - p_in_end += 64; - - for( ; p_in < p_in_end ; ) - { - /* Do 1 pixel at a time */ - *p_out++ = ~( *p_in++ ); + uint64_t *p_in64, *p_out64; + + p_line_end = p_in + p_pic->p[i_index].i_visible_pitch - 64; + + p_in64 = (uint64_t*)p_in; + p_out64 = (uint64_t*)p_out; + + while( p_in64 < (uint64_t *)p_line_end ) + { + /* Do 64 pixels at a time */ + *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++; + *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++; + *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++; + *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++; + } + + p_in = (uint8_t*)p_in64; + p_out = (uint8_t*)p_out64; + p_line_end += 64; + + for( ; p_in < p_line_end ; ) + { + *p_out++ = ~( *p_in++ ); + } + + p_in += p_pic->p[i_index].i_pitch + - p_pic->p[i_index].i_visible_pitch; + p_out += p_outpic->p[i_index].i_pitch + - p_outpic->p[i_index].i_visible_pitch; } } - vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); - - vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); + return CopyInfoAndRelease( p_outpic, p_pic ); } -