X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Finvert.c;h=29fad2d6580825ca8aecee3c9ddf79604469ea2d;hb=9293845116a263a25fe1b7823add056d91b41bb0;hp=1d9e62d417187d5e8dda65893f44b2d62f3946c4;hpb=f6cf9ef8b887f4ef9a9692603ba9907edfdf9db2;p=vlc diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c index 1d9e62d417..29fad2d658 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, 2001, 2002, 2003 VideoLAN + * $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 @@ -42,11 +42,14 @@ static int Init ( vout_thread_t * ); static void End ( vout_thread_t * ); static void Render ( vout_thread_t *, picture_t * ); +static int SendEvents( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("invert video module") ); + set_description( _("Invert video filter") ); set_capability( "video filter", 0 ); add_shortcut( "invert" ); set_callbacks( Create, Destroy ); @@ -63,6 +66,14 @@ 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 ); +} + /***************************************************************************** * Create: allocates Invert video thread output method ***************************************************************************** @@ -77,7 +88,7 @@ static int Create( vlc_object_t *p_this ) if( p_vout->p_sys == NULL ) { msg_Err( p_vout, "out of memory" ); - return( 1 ); + return VLC_ENOMEM; } p_vout->pf_init = Init; @@ -85,8 +96,9 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_manage = NULL; p_vout->pf_render = Render; p_vout->pf_display = NULL; + p_vout->pf_control = Control; - return( 0 ); + return VLC_SUCCESS; } /***************************************************************************** @@ -108,8 +120,7 @@ static int Init( vout_thread_t *p_vout ) /* 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->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 ); @@ -118,12 +129,16 @@ static int Init( vout_thread_t *p_vout ) { msg_Err( p_vout, "can't open vout, aborting" ); - return( 0 ); + return VLC_EGENERIC; } - + ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - return( 0 ); + ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + + ADD_PARENT_CALLBACKS( SendEventsToChild ); + + return VLC_SUCCESS; } /***************************************************************************** @@ -147,10 +162,14 @@ 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 ); + 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 ); } @@ -176,40 +195,49 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) return; } msleep( VOUT_OUTMEM_SLEEP ); - } + } vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); for( i_index = 0 ; i_index < p_pic->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_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++ ); + p_line_end = p_in + p_pic->p[i_index].i_visible_pitch - 64; + + for( ; p_in < p_line_end ; ) + { + /* Do 64 pixels at a time */ + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + *((uint64_t*)p_out)++ = ~( *((uint64_t*)p_in)++ ); + } + + 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; } } @@ -218,3 +246,24 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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; +}