X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fnoise.c;h=9f2a6b5f30b0ad24e5af7b9503b97c03d08f00fc;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=06fb31ac05a15892e5cef7f3397b386e8215819a;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc

diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c
index 06fb31ac05..9f2a6b5f30 100644
--- a/modules/video_filter/noise.c
+++ b/modules/video_filter/noise.c
@@ -31,16 +31,15 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
+#include <vlc_rand.h>
 
-#include "vlc_filter.h"
+#include <vlc_filter.h>
+#include "filter_picture.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 "noise-"
@@ -48,27 +47,16 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * 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, Destroy );
-vlc_module_end();
+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 )
 
-/*****************************************************************************
- * 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
-{
-    mtime_t last_date;
-};
+    add_shortcut( "noise" )
+    set_callbacks( Create, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  * Create: allocates Distort video thread output method
@@ -78,33 +66,11 @@ struct filter_sys_t
 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->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
  *****************************************************************************
@@ -115,23 +81,18 @@ static void Destroy( vlc_object_t *p_this )
 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;
-    mtime_t new_date = mdate();
 
     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;
     }
 
-    p_sys->last_date = new_date;
-
     for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
     {
         uint8_t *p_in = p_pic->p[i_index].p_pixels;
@@ -139,46 +100,38 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
         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;
+        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( rand()%8 )
+            if( vlc_mrand48()&7 )
             {
                 /* line isn't noisy */
-                vlc_memcpy( p_out+i_line*i_pitch, p_in+i_line*i_pitch,
+                vlc_memcpy( p_out+i_line*i_out_pitch, p_in+i_line*i_in_pitch,
                             i_num_cols );
             }
             else
             {
                 /* this line is noisy */
-                int noise_level = rand()%8+2;
+                unsigned noise_level = (vlc_mrand48()&7)+2;
                 for( i_col = 0; i_col < i_num_cols ; i_col++ )
                 {
-                    if( rand()%noise_level )
+                    if( ((unsigned)vlc_mrand48())%noise_level )
                     {
-                        p_out[i_line*i_pitch+i_col] =
-                            p_in[i_line*i_pitch+i_col];
+                        p_out[i_line*i_out_pitch+i_col] =
+                            p_in[i_line*i_in_pitch+i_col];
                     }
                     else
                     {
-                        p_out[i_line*i_pitch+i_col] = (rand()%3)*0x7f;
+                        p_out[i_line*i_out_pitch+i_col] = (vlc_mrand48()&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 );
 }