X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fsharpen.c;h=2d78cadde83713ccf15d16f34c46846e5fed793f;hb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;hp=23bd6f8b495c9aa30f1123d79219268f9ae8193c;hpb=a900b500ae57ff9fc6e7b5fcce1ba126f274838b;p=vlc

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 23bd6f8b49..2d78cadde8 100644
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * sharpen.c: Sharpen video filter
  *****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
+ * Copyright (C) 2003-2007 the VideoLAN team
  * $Id: sharpen.c 18062 2006-11-26 14:20:34Z zorglub $
  *
  * Author: Jérémy DEMEULE <dj_mulder at djduron dot no-ip dot org>
@@ -32,7 +32,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
 #include <vlc/vlc.h>
@@ -50,6 +49,8 @@ static int  Create    ( vlc_object_t * );
 static void Destroy   ( vlc_object_t * );
 
 static picture_t *Filter( filter_t *, picture_t * );
+static int SharpenCallback( vlc_object_t *, char const *,
+                            vlc_value_t, vlc_value_t, void * );
 
 #define FILTER_PREFIX "sharpen-"
 
@@ -82,6 +83,7 @@ static const char *ppsz_filter_options[] = {
 struct filter_sys_t
 {
     float f_sigma;
+    int tab_precalc[512];
 };
 
 /*****************************************************************************
@@ -92,6 +94,16 @@ inline static int32_t clip( int32_t a )
     return (a > 255) ? 255 : (a < 0) ? 0 : a;
 }
 
+static void init_precalc_table(filter_sys_t *p_filter)
+{
+    float sigma = p_filter->f_sigma;
+    
+    for(int i = 0; i < 512; ++i)
+    {
+        p_filter->tab_precalc[i] = (i - 256) * sigma;
+    }
+}
+
 /*****************************************************************************
  * Create: allocates Sharpen video thread output method
  *****************************************************************************
@@ -114,10 +126,12 @@ static int Create( vlc_object_t *p_this )
     config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
                    p_filter->p_cfg );
 
-    var_Create( p_filter, FILTER_PREFIX "sigma",
-                VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+    p_filter->p_sys->f_sigma =
+        var_CreateGetFloatCommand( p_filter, FILTER_PREFIX "sigma" );
+    var_AddCallback( p_filter, FILTER_PREFIX "sigma",
+                     SharpenCallback, p_filter->p_sys );
 
-    p_filter->p_sys->f_sigma = var_GetFloat(p_this, FILTER_PREFIX "sigma");
+    init_precalc_table(p_filter->p_sys);
 
     return VLC_SUCCESS;
 }
@@ -145,7 +159,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 {
     picture_t *p_outpic;
     int i, j;
-    vlc_value_t val;
     uint8_t *p_src = NULL;
     uint8_t *p_out = NULL;
     int i_src_pitch;
@@ -172,7 +185,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     if( !p_src || !p_out )
     {
         msg_Warn( p_filter, "can't get Y plane" );
-        if( p_pic->pf_release ) 
+        if( p_pic->pf_release )
             p_pic->pf_release( p_pic );
         return NULL;
     }
@@ -206,8 +219,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
                   (p_src[(i + 1) * i_src_pitch + j    ] * v1) +
                   (p_src[(i + 1) * i_src_pitch + j + 1] * v1);
 
-            p_out[i * i_src_pitch + j] =  clip( p_src[i * i_src_pitch + j] +
-                        (p_filter->p_sys->f_sigma * pix) );
+	    pix = pix >= 0 ? clip(pix) : -clip(pix * -1);
+	    p_out[i * i_src_pitch + j] = clip( p_src[i * i_src_pitch + j] + 
+			p_filter->p_sys->tab_precalc[pix + 256] );
         }
     }
 
@@ -232,3 +246,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     return p_outpic;
 }
+
+static int SharpenCallback( vlc_object_t *p_this, char const *psz_var,
+                            vlc_value_t oldval, vlc_value_t newval,
+                            void *p_data )
+{
+    filter_sys_t *p_sys = (filter_sys_t *)p_data;
+    if( !strcmp( psz_var, FILTER_PREFIX "sigma" ) )
+        p_sys->f_sigma = __MIN( 2., __MAX( 0., newval.f_float ) );
+    init_precalc_table(p_sys);
+    return VLC_SUCCESS;
+}