lua/intf: Fix a memleak.

[vlc] / modules / video_filter / noise.c

diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c
index 8562f5e177ff68e92d1c5c332ed5a02989494711..e61391e3e4e2787dbcd52ac29d12b806ed003248 100644 (file)
--- a/modules/video_filter/noise.c
+++ b/modules/video_filter/noise.c
@@ -24,15 +24,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <math.h>                                            /* sin(), cos() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
+#include "filter_picture.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -48,8 +50,8 @@ static picture_t *Filter( filter_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Noise video filter") );
-    set_shortname( _( "Noise" ));
+    set_description( N_("Noise video filter") );
+    set_shortname( N_( "Noise" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -58,10 +60,6 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
-    NULL
-};
-
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor
  *****************************************************************************
@@ -85,13 +83,7 @@ static int Create( vlc_object_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;
-    }
-
-    config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
-                       p_filter->p_cfg );
 
     p_filter->pf_video_filter = Filter;
 
@@ -127,12 +119,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     if( !p_pic ) return NULL;
 
-    p_outpic = p_filter->pf_vout_buffer_new( p_filter );
+    p_outpic = filter_NewPicture( 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 );
+        picture_Release( p_pic );
         return NULL;
     }
 
@@ -140,23 +131,22 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
     {
-        int i_line, i_num_lines, i_col, i_num_cols;
-        uint8_t *p_in, *p_out;
+        uint8_t *p_in = p_pic->p[i_index].p_pixels;
+        uint8_t *p_out = p_outpic->p[i_index].p_pixels;
 
-        p_in = p_pic->p[i_index].p_pixels;
-        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_pitch = p_pic->p[i_index].i_pitch;
 
-        i_num_lines = p_pic->p[i_index].i_visible_lines;
-        i_num_cols = p_pic->p[i_index].i_visible_pitch;
+        int i_line, i_col;
 
         for( i_line = 0 ; i_line < i_num_lines ; i_line++ )
         {
             if( rand()%8 )
             {
                 /* line isn't noisy */
-                p_filter->p_libvlc->pf_memcpy( p_out+i_line*i_num_cols,
-                                               p_in+i_line*i_num_cols,
-                                               i_num_cols );
+                vlc_memcpy( p_out+i_line*i_pitch, p_in+i_line*i_pitch,
+                            i_num_cols );
             }
             else
             {
@@ -166,26 +156,17 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
                 {
                     if( rand()%noise_level )
                     {
-                        p_out[i_line*i_num_cols+i_col] =
-                            p_in[i_line*i_num_cols+i_col];
+                        p_out[i_line*i_pitch+i_col] =
+                            p_in[i_line*i_pitch+i_col];
                     }
                     else
                     {
-                        p_out[i_line*i_num_cols+i_col] = (rand()%3)*0x7f;
+                        p_out[i_line*i_pitch+i_col] = (rand()%3)*0x7f;
                     }
                 }
             }
         }
     }
 
-    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;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }