Split the distort video filter module into several video filter2 modules.

configure.ac

@@ -564,7 +564,7 @@ AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
 AC_TYPE_SIGNAL
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264 goom visual],[-lm])
+  VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual],[-lm])
 ])
 AC_CHECK_LIB(m,pow,[
   VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq vlc freetype mpc dmo quicktime realaudio galaktos],[-lm])
@@ -1122,7 +1122,7 @@ dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac])
 VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur rv32])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32])
 VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
 VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])

modules/video_filter/Modules.am

@@ -2,7 +2,6 @@ SOURCES_mosaic = mosaic.c mosaic.h
 SOURCES_transform = transform.c
 SOURCES_invert = invert.c
 SOURCES_adjust = adjust.c
-SOURCES_distort = distort.c
 SOURCES_wall = wall.c
 SOURCES_clone = clone.c
 SOURCES_crop = crop.c
@@ -18,4 +17,8 @@ SOURCES_motiondetect = motiondetect.c
 SOURCES_rv32 = rv32.c
 SOURCES_osdmenu = osdmenu.c
 SOURCES_magnify = magnify.c
+SOURCES_wave = wave.c
+SOURCES_ripple = ripple.c
+SOURCES_psychedelic = psychedelic.c
+SOURCES_gradient = gradient.c
 noinst_HEADERS = filter_common.h

modules/video_filter/psychedelic.c

+/*****************************************************************************
+ * Psychedelic.c : Psychedelic video effect plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2000-2006 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Antoine Cellerier <dionoea -at- videolan -dot- org>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
+
+#include <math.h>                                            /* sin(), cos() */
+
+#include <vlc/vlc.h>
+#include <vlc/decoder.h>
+
+#include "vlc_filter.h"
+#include "vlc_image.h"
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int  Create    ( vlc_object_t * );
+static void Destroy   ( vlc_object_t * );
+
+static picture_t *Filter( filter_t *, picture_t * );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Psychedelic video filter") );
+    set_shortname( N_( "Psychedelic" ));
+    set_capability( "video filter2", 0 );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+
+    add_shortcut( "psychedelic" );
+    set_callbacks( Create, Destroy );
+vlc_module_end();
+
+/*****************************************************************************
+ * vout_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.
+ *****************************************************************************/
+struct filter_sys_t
+{
+    image_handler_t *p_image;
+    unsigned int x, y, scale;
+    int xinc, yinc, scaleinc;
+    uint8_t u,v;
+};
+
+/*****************************************************************************
+ * Create: allocates Distort video thread output method
+ *****************************************************************************
+ * This function allocates and initializes a Distort vout method.
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_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;
+
+    p_filter->p_sys->x = 10;
+    p_filter->p_sys->y = 10;
+    p_filter->p_sys->scale = 1;
+    p_filter->p_sys->xinc = 1;
+    p_filter->p_sys->yinc = 1;
+    p_filter->p_sys->scaleinc = 1;
+    p_filter->p_sys->u = 0;
+    p_filter->p_sys->v = 0;
+    p_filter->p_sys->p_image = NULL;
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Destroy: destroy Distort video thread output method
+ *****************************************************************************
+ * Terminate an output method created by DistortCreateOutputMethod
+ *****************************************************************************/
+static void Destroy( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+
+    if( p_filter->p_sys->p_image )
+        image_HandlerDelete( p_filter->p_sys->p_image );
+
+    free( p_filter->p_sys );
+}
+
+/*****************************************************************************
+ * Render: displays previously rendered output
+ *****************************************************************************
+ * This function send the currently rendered image to Distort image, waits
+ * until it is displayed and switch the two rendering buffers, preparing next
+ * frame.
+ *****************************************************************************/
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
+{
+    picture_t *p_outpic;
+
+    unsigned int w, h;
+    int x,y;
+    uint8_t u,v;
+
+    video_format_t fmt_out = {0};
+    picture_t *p_converted;
+
+    if( !p_pic ) return NULL;
+
+    p_outpic = p_filter->pf_vout_buffer_new( 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 );
+        return NULL;
+    }
+
+    if( !p_filter->p_sys->p_image )
+        p_filter->p_sys->p_image = image_HandlerCreate( p_filter );
+
+    /* chrominance */
+    u = p_filter->p_sys->u;
+    v = p_filter->p_sys->v;
+    for( y = 0; y<p_outpic->p[U_PLANE].i_lines; y++)
+    {
+        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,
+                v, p_outpic->p[V_PLANE].i_pitch );
+        if( v == 0 && u != 0 )
+            u --;
+        else if( u == 0xff )
+            v --;
+        else if( v == 0xff )
+            u ++;
+        else if( u == 0 )
+            v ++;
+    }
+
+    /* luminance */
+    p_filter->p_vlc->pf_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 */
+    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;
+    p_converted = image_Convert( p_filter->p_sys->p_image, p_pic,
+                                 &(p_pic->format), &fmt_out );
+
+#define copyimage( plane, b ) \
+    for( y=0; y<p_converted->p[plane].i_visible_lines; y++) { \
+    for( x=0; x<p_converted->p[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 );
+
+    p_filter->p_sys->x += p_filter->p_sys->xinc;
+    p_filter->p_sys->y += p_filter->p_sys->yinc;
+
+    p_filter->p_sys->scale += p_filter->p_sys->scaleinc;
+    if( p_filter->p_sys->scale >= 50 ) p_filter->p_sys->scaleinc = -1;
+    if( p_filter->p_sys->scale <= 1 ) p_filter->p_sys->scaleinc = 1;
+
+    w = p_filter->fmt_out.video.i_width*p_filter->p_sys->scale/150;
+    h = p_filter->fmt_out.video.i_height*p_filter->p_sys->scale/150;
+    if( p_filter->p_sys->x*2 + w >= p_filter->fmt_out.video.i_width )
+        p_filter->p_sys->xinc = -1;
+    if( p_filter->p_sys->x <= 0 )
+        p_filter->p_sys->xinc = 1;
+
+    if( p_filter->p_sys->x*2 + w >= p_filter->fmt_out.video.i_width )
+        p_filter->p_sys->x = (p_filter->fmt_out.video.i_width-w)/2;
+    if( p_filter->p_sys->y*2 + h >= p_filter->fmt_out.video.i_height )
+        p_filter->p_sys->y = (p_filter->fmt_out.video.i_height-h)/2;
+
+    if( p_filter->p_sys->y*2 + h >= p_filter->fmt_out.video.i_height )
+        p_filter->p_sys->yinc = -1;
+    if( p_filter->p_sys->y <= 0 )
+        p_filter->p_sys->yinc = 1;
+
+    for( y = 0; y< 16; y++ )
+    {
+        if( p_filter->p_sys->v == 0 && p_filter->p_sys->u != 0 )
+            p_filter->p_sys->u -= 1;
+        else if( p_filter->p_sys->u == 0xff )
+            p_filter->p_sys->v -= 1;
+        else if( p_filter->p_sys->v == 0xff )
+            p_filter->p_sys->u += 1;
+        else if( p_filter->p_sys->u == 0 )
+            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;
+
+    p_pic->pf_release( p_pic );
+
+    return p_outpic;
+}

modules/video_filter/ripple.c

+/*****************************************************************************
+ * ripple.c : Ripple video effect plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2000-2006 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Antoine Cellerier <dionoea -at- videolan -dot- org>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
+
+#include <math.h>                                            /* sin(), cos() */
+
+#include <vlc/vlc.h>
+#include <vlc/decoder.h>
+
+#include "vlc_filter.h"
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int  Create    ( vlc_object_t * );
+static void Destroy   ( vlc_object_t * );
+
+static picture_t *Filter( filter_t *, picture_t * );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Ripple video filter") );
+    set_shortname( N_( "Ripple" ));
+    set_capability( "video filter2", 0 );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+
+    add_shortcut( "ripple" );
+    set_callbacks( Create, Destroy );
+vlc_module_end();
+
+/*****************************************************************************
+ * vout_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.
+ *****************************************************************************/
+struct filter_sys_t
+{
+    double  f_angle;
+    mtime_t last_date;
+};
+
+/*****************************************************************************
+ * Create: allocates Distort video thread output method
+ *****************************************************************************
+ * This function allocates and initializes a Distort vout method.
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_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;
+
+    p_filter->p_sys->f_angle = 0.0;
+    p_filter->p_sys->last_date = 0;
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Destroy: destroy Distort video thread output method
+ *****************************************************************************
+ * Terminate an output method created by DistortCreateOutputMethod
+ *****************************************************************************/
+static void Destroy( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    free( p_filter->p_sys );
+}
+
+/*****************************************************************************
+ * Render: displays previously rendered output
+ *****************************************************************************
+ * This function send the currently rendered image to Distort image, waits
+ * until it is displayed and switch the two rendering buffers, preparing next
+ * frame.
+ *****************************************************************************/
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
+{
+    picture_t *p_outpic;
+    int i_index;
+    double f_angle;
+    mtime_t new_date = mdate();
+
+    if( !p_pic ) return NULL;
+
+    p_outpic = p_filter->pf_vout_buffer_new( 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 );
+        return NULL;
+    }
+
+    p_filter->p_sys->f_angle -= (p_filter->p_sys->last_date - new_date) / 100000.0;
+    p_filter->p_sys->last_date = new_date;
+    f_angle = p_filter->p_sys->f_angle;
+
+    for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
+    {
+        int i_line, i_first_line, i_num_lines, i_offset;
+        uint8_t black_pixel;
+        uint8_t *p_in, *p_out;
+
+        black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80;
+
+        i_num_lines = p_pic->p[i_index].i_visible_lines;
+
+        i_first_line = i_num_lines * 4 / 5;
+
+        p_in = p_pic->p[i_index].p_pixels;
+        p_out = p_outpic->p[i_index].p_pixels;
+
+        for( i_line = 0 ; i_line < i_first_line ; i_line++ )
+        {
+            p_filter->p_vlc->pf_memcpy( p_out, p_in,
+                                      p_pic->p[i_index].i_visible_pitch );
+            p_in += p_pic->p[i_index].i_pitch;
+            p_out += p_outpic->p[i_index].i_pitch;
+        }
+
+        /* Ok, we do 3 times the sin() calculation for each line. So what ? */
+        for( i_line = i_first_line ; i_line < i_num_lines ; i_line++ )
+        {
+            /* Calculate today's offset, don't go above 1/20th of the screen */
+            i_offset = (int)( (double)(p_pic->p[i_index].i_pitch)
+                         * sin( f_angle + 2.0 * (double)i_line
+                                              / (double)( 1 + i_line
+                                                            - i_first_line) )
+                         * (double)(i_line - i_first_line)
+                         / (double)i_num_lines
+                         / 8.0 );
+
+            if( i_offset )
+            {
+                if( i_offset < 0 )
+                {
+                    p_filter->p_vlc->pf_memcpy( p_out, p_in - i_offset,
+                             p_pic->p[i_index].i_visible_pitch + i_offset );
+                    p_in -= p_pic->p[i_index].i_pitch;
+                    p_out += p_outpic->p[i_index].i_pitch;
+                    memset( p_out + i_offset, black_pixel, -i_offset );
+                }
+                else
+                {
+                    p_filter->p_vlc->pf_memcpy( p_out + i_offset, p_in,
+                             p_pic->p[i_index].i_visible_pitch - i_offset );
+                    memset( p_out, black_pixel, i_offset );
+                    p_in -= p_pic->p[i_index].i_pitch;
+                    p_out += p_outpic->p[i_index].i_pitch;
+                }
+            }
+            else
+            {
+                p_filter->p_vlc->pf_memcpy( p_out, p_in,
+                                          p_pic->p[i_index].i_visible_pitch );
+                p_in -= p_pic->p[i_index].i_pitch;
+                p_out += p_outpic->p[i_index].i_pitch;
+            }
+
+        }
+    }
+
+    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;
+
+    p_pic->pf_release( p_pic );
+
+    return p_outpic;
+}

modules/video_filter/wave.c

+/*****************************************************************************
+ * wave.c : Wave video effect plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2000-2006 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Antoine Cellerier <dionoea -at- videolan -dot- org>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
+
+#include <math.h>                                            /* sin(), cos() */
+
+#include <vlc/vlc.h>
+#include <vlc/decoder.h>
+
+#include "vlc_filter.h"
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int  Create    ( vlc_object_t * );
+static void Destroy   ( vlc_object_t * );
+
+static picture_t *Filter( filter_t *, picture_t * );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Wave video filter") );
+    set_shortname( N_( "Wave" ));
+    set_capability( "video filter2", 0 );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+
+    add_shortcut( "wave" );
+    set_callbacks( Create, Destroy );
+vlc_module_end();
+
+/*****************************************************************************
+ * vout_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.
+ *****************************************************************************/
+struct filter_sys_t
+{
+    double  f_angle;
+    mtime_t last_date;
+};
+
+/*****************************************************************************
+ * Create: allocates Distort video thread output method
+ *****************************************************************************
+ * This function allocates and initializes a Distort vout method.
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_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;
+
+    p_filter->p_sys->f_angle = 0.0;
+    p_filter->p_sys->last_date = 0;
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Destroy: destroy Distort video thread output method
+ *****************************************************************************
+ * Terminate an output method created by DistortCreateOutputMethod
+ *****************************************************************************/
+static void Destroy( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    free( p_filter->p_sys );
+}
+
+/*****************************************************************************
+ * Render: displays previously rendered output
+ *****************************************************************************
+ * This function send the currently rendered image to Distort image, waits
+ * until it is displayed and switch the two rendering buffers, preparing next
+ * frame.
+ *****************************************************************************/
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
+{
+    picture_t *p_outpic;
+    int i_index;
+    double f_angle;
+    mtime_t new_date = mdate();
+
+    if( !p_pic ) return NULL;
+
+    p_outpic = p_filter->pf_vout_buffer_new( 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 );
+        return NULL;
+    }
+
+    p_filter->p_sys->f_angle += (new_date - p_filter->p_sys->last_date) / 200000.0;
+    p_filter->p_sys->last_date = new_date;
+    f_angle = p_filter->p_sys->f_angle;
+
+    for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
+    {
+        int i_line, i_num_lines, i_offset;
+        uint8_t black_pixel;
+        uint8_t *p_in, *p_out;
+
+        p_in = p_pic->p[i_index].p_pixels;
+        p_out = p_outpic->p[i_index].p_pixels;
+
+        i_num_lines = p_pic->p[i_index].i_visible_lines;
+
+        black_pixel = ( i_index == Y_PLANE ) ? 0x00 : 0x80;
+
+        /* Ok, we do 3 times the sin() calculation for each line. So what ? */
+        for( i_line = 0 ; i_line < i_num_lines ; i_line++ )
+        {
+            /* Calculate today's offset, don't go above 1/20th of the screen */
+            i_offset = (int)( (double)(p_pic->p[i_index].i_visible_pitch)
+                         * sin( f_angle + 10.0 * (double)i_line
+                                               / (double)i_num_lines )
+                         / 20.0 );
+
+            if( i_offset )
+            {
+                if( i_offset < 0 )
+                {
+                    p_filter->p_vlc->pf_memcpy( p_out, p_in - i_offset,
+                             p_pic->p[i_index].i_visible_pitch + i_offset );
+                    p_in += p_pic->p[i_index].i_pitch;
+                    p_out += p_outpic->p[i_index].i_pitch;
+                    memset( p_out + i_offset, black_pixel, -i_offset );
+                }
+                else
+                {
+                    p_filter->p_vlc->pf_memcpy( p_out + i_offset, p_in,
+                             p_pic->p[i_index].i_visible_pitch - i_offset );
+                    memset( p_out, black_pixel, i_offset );
+                    p_in += p_pic->p[i_index].i_pitch;
+                    p_out += p_outpic->p[i_index].i_pitch;
+                }
+            }
+            else
+            {
+                p_filter->p_vlc->pf_memcpy( p_out, p_in,
+                                          p_pic->p[i_index].i_visible_pitch );
+                p_in += p_pic->p[i_index].i_pitch;
+                p_out += p_outpic->p[i_index].i_pitch;
+            }
+
+        }
+    }
+
+    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;
+
+    p_pic->pf_release( p_pic );
+
+    return p_outpic;
+}