[vlc-commits] Removed noise video filter.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jun 26 02:47:38 2011 +0200| [6e6dd69bcac19609572a2347c8a6a94ecbdb3dec] | committer: Laurent Aimar

Removed noise video filter.

It is quite useless and will confuse users who want to add "film grain"
to the video.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e6dd69bcac19609572a2347c8a6a94ecbdb3dec
---

 modules/video_filter/Modules.am |    2 -
 modules/video_filter/noise.c    |  137 ---------------------------------------
 2 files changed, 0 insertions(+), 139 deletions(-)

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index e6abb4f..9ace71f 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -39,7 +39,6 @@ SOURCES_panoramix = panoramix.c
 SOURCES_opencv_wrapper = opencv_wrapper.c
 SOURCES_opencv_example = opencv_example.c filter_event_info.h
 SOURCES_rotate = rotate.c
-SOURCES_noise = noise.c
 SOURCES_puzzle = puzzle.c
 SOURCES_colorthres = colorthres.c
 SOURCES_extract = extract.c
@@ -111,7 +110,6 @@ libvlc_LTLIBRARIES += \
 	libmosaic_plugin.la \
 	libmotionblur_plugin.la \
 	libmotiondetect_plugin.la \
-	libnoise_plugin.la \
 	libposterize_plugin.la \
 	libpsychedelic_plugin.la \
 	libpuzzle_plugin.la \
diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c
deleted file mode 100644
index 9f2a6b5..0000000
--- a/modules/video_filter/noise.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************
- * noise.c : "add noise to image" video filter
- *****************************************************************************
- * Copyright (C) 2000-2006 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
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_rand.h>
-
-#include <vlc_filter.h>
-#include "filter_picture.h"
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int  Create    ( vlc_object_t * );
-static picture_t *Filter( filter_t *, picture_t * );
-
-#define FILTER_PREFIX "noise-"
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin ()
-    set_description( N_("Noise video filter") )
-    set_shortname( N_( "Noise" ))
-    set_capability( "video filter2", 0 )
-    set_category( CAT_VIDEO )
-    set_subcategory( SUBCAT_VIDEO_VFILTER )
-
-    add_shortcut( "noise" )
-    set_callbacks( Create, NULL )
-vlc_module_end ()
-
-/*****************************************************************************
- * 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;
-    p_filter->pf_video_filter = Filter;
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * 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;
-
-    if( !p_pic ) return NULL;
-
-    p_outpic = filter_NewPicture( p_filter );
-    if( !p_outpic )
-    {
-        msg_Warn( p_filter, "can't get output picture" );
-        picture_Release( p_pic );
-        return NULL;
-    }
-
-    for( i_index = 0 ; 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_num_lines = p_pic->p[i_index].i_visible_lines;
-        const int i_num_cols = p_pic->p[i_index].i_visible_pitch;
-        const int i_in_pitch = p_pic->p[i_index].i_pitch;
-        const int i_out_pitch = p_outpic->p[i_index].i_pitch;
-
-        int i_line, i_col;
-
-        for( i_line = 0 ; i_line < i_num_lines ; i_line++ )
-        {
-            if( vlc_mrand48()&7 )
-            {
-                /* line isn't noisy */
-                vlc_memcpy( p_out+i_line*i_out_pitch, p_in+i_line*i_in_pitch,
-                            i_num_cols );
-            }
-            else
-            {
-                /* this line is noisy */
-                unsigned noise_level = (vlc_mrand48()&7)+2;
-                for( i_col = 0; i_col < i_num_cols ; i_col++ )
-                {
-                    if( ((unsigned)vlc_mrand48())%noise_level )
-                    {
-                        p_out[i_line*i_out_pitch+i_col] =
-                            p_in[i_line*i_in_pitch+i_col];
-                    }
-                    else
-                    {
-                        p_out[i_line*i_out_pitch+i_col] = (vlc_mrand48()&3)*0x7f;
-                    }
-                }
-            }
-        }
-    }
-
-    return CopyInfoAndRelease( p_outpic, p_pic );
-}