New video filter to add grain to a video. This is work in progress (I'm...

New video filter to add grain to a video. This is work in progress (I'm commiting so people can test using the win32 nightlies)

configure.ac

@@ -624,7 +624,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 wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise],[-lm])
+  VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain],[-lm])
 ])
 AC_CHECK_LIB(m,pow,[
   VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
@@ -1236,7 +1236,7 @@ dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
 VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise extract sharpen])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen])
 VLC_ADD_PLUGINS([converter_fixed mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
 VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])

modules/video_filter/Modules.am

@@ -33,4 +33,5 @@ SOURCES_erase = erase.c
 SOURCES_bluescreen = bluescreen.c
 SOURCES_alphamask = alphamask.c
 SOURCES_gaussianblur = gaussianblur.c
+SOURCES_grain = grain.c
 noinst_HEADERS = filter_common.h

modules/video_filter/grain.c

+/*****************************************************************************
+ * noise.c : "add grain to image" video filter
+ *****************************************************************************
+ * Copyright (C) 2000-2007 the VideoLAN team
+ * $Id$
+ *
+ * Authors: 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 <vlc/vlc.h>
+#include <vlc_vout.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 * );
+
+#define FILTER_PREFIX "grain-"
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Grain video filter") );
+    set_shortname( _( "Grain" ));
+    set_capability( "video filter2", 0 );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
+
+    set_callbacks( Create, Destroy );
+vlc_module_end();
+
+static const char *ppsz_filter_options[] = {
+    NULL
+};
+
+struct filter_sys_t
+{
+    int *p_noise;
+};
+
+static int Create( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+
+    /* FIXME: check that chroma is YUV based */
+
+    /* 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;
+    }
+
+    config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
+                       p_filter->p_cfg );
+
+    p_filter->pf_video_filter = Filter;
+
+    p_filter->p_sys->p_noise = NULL;
+
+    return VLC_SUCCESS;
+}
+
+static void Destroy( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    free( p_filter->p_sys->p_noise );
+    free( p_filter->p_sys );
+}
+
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
+{
+    picture_t *p_outpic;
+    filter_sys_t *p_sys = p_filter->p_sys;
+    int i_index;
+
+    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;
+    }
+
+    {
+        uint8_t *p_in = p_pic->p[Y_PLANE].p_pixels;
+        uint8_t *p_out = p_outpic->p[Y_PLANE].p_pixels;
+
+        const int i_num_lines = p_pic->p[Y_PLANE].i_visible_lines;
+        const int i_num_cols = p_pic->p[Y_PLANE].i_visible_pitch;
+        const int i_pitch = p_pic->p[Y_PLANE].i_pitch;
+
+        int i_line, i_col;
+
+        int *p_noise = p_sys->p_noise;
+        if( !p_noise )
+        {
+            p_noise = p_sys->p_noise =
+                (int*)malloc(i_pitch*i_num_lines*sizeof(int));
+        }
+
+        for( i_line = 0; i_line < i_num_lines; i_line++ )
+        {
+            for( i_col = 0; i_col < i_num_cols; i_col++ )
+            {
+                p_noise[i_line*i_pitch+i_col] = ((rand()&0x1f)-0x0f);
+            }
+        }
+
+        for( i_line = 2/*0*/ ; i_line < i_num_lines-2/**/; i_line++ )
+        {
+            for( i_col = 2/*0*/; i_col < i_num_cols/2; i_col++ )
+            {
+                p_out[i_line*i_pitch+i_col] = clip_uint8_vlc(
+                          p_in[i_line*i_pitch+i_col]
+#if 0
+                        + p_noise[i_line*i_pitch+i_col] );
+#else
+/* 2 rows up */
+              + ((  ( p_noise[(i_line-2)*i_pitch+i_col-2]<<1 )
+              + ( p_noise[(i_line-2)*i_pitch+i_col-1]<<2 )
+              + ( p_noise[(i_line-2)*i_pitch+i_col]<<2 )
+              + ( p_noise[(i_line-2)*i_pitch+i_col+1]<<2 )
+              + ( p_noise[(i_line-2)*i_pitch+i_col+2]<<1 )
+              /* 1 row up */
+              + ( p_noise[(i_line-1)*i_pitch+i_col-2]<<2 )
+              + ( p_noise[(i_line-1)*i_pitch+i_col-1]<<3 )
+              + ( p_noise[(i_line-1)*i_pitch+i_col]*12 )
+              + ( p_noise[(i_line-1)*i_pitch+i_col+1]<<3 )
+              + ( p_noise[(i_line-1)*i_pitch+i_col+2]<<2 )
+              /* */
+              + ( p_noise[i_line*i_pitch+i_col-2]<<2 )
+              + ( p_noise[i_line*i_pitch+i_col-1]*12 )
+              + ( p_noise[i_line*i_pitch+i_col]<<4 )
+              + ( p_noise[i_line*i_pitch+i_col+1]*12 )
+              + ( p_noise[i_line*i_pitch+i_col+2]<<2 )
+              /* 1 row down */
+              + ( p_noise[(i_line+1)*i_pitch+i_col-2]<<2 )
+              + ( p_noise[(i_line+1)*i_pitch+i_col-1]<<3 )
+              + ( p_noise[(i_line+1)*i_pitch+i_col]*12 )
+              + ( p_noise[(i_line+1)*i_pitch+i_col+1]<<3 )
+              + ( p_noise[(i_line+1)*i_pitch+i_col+2]<<2 )
+              /* 2 rows down */
+              + ( p_noise[(i_line+2)*i_pitch+i_col-2]<<1 )
+              + ( p_noise[(i_line+2)*i_pitch+i_col-1]<<2 )
+              + ( p_noise[(i_line+2)*i_pitch+i_col]<<2 )
+              + ( p_noise[(i_line+2)*i_pitch+i_col+1]<<2 )
+              + ( p_noise[(i_line+2)*i_pitch+i_col+2]<<1 )
+              )>>7/*/152*/));
+#endif
+
+            }
+            for( ; i_col < i_num_cols; i_col++ )
+                p_out[i_line*i_pitch+i_col] = p_in[i_line*i_pitch+i_col];
+        }
+    }
+
+    for( i_index = 1; i_index < p_pic->i_planes; i_index++ )
+    {
+        uint8_t *p_in = p_pic->p[i_index].p_pixels;
+        uint8_t *p_out = p_outpic->p[i_index].p_pixels;
+
+        const int i_lines = p_pic->p[i_index].i_lines;
+        const int i_pitch = p_pic->p[i_index].i_pitch;
+
+        p_filter->p_libvlc->pf_memcpy( p_out, p_in, i_lines * 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;
+
+    if( p_pic->pf_release )
+        p_pic->pf_release( p_pic );
+
+    return p_outpic;
+}