Merge ../mlt

[melted] / src / modules / oldfilm / filter_grain.c

diff --git a/src/modules/oldfilm/filter_grain.c b/src/modules/oldfilm/filter_grain.c
index 7557dd4..296da5a 100644 (file)
--- a/src/modules/oldfilm/filter_grain.c
+++ b/src/modules/oldfilm/filter_grain.c
@@ -23,7 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-
+#define MIN(a,b) (a<b?a:b)
+#define MAX(a,b) (a>b?a:b)
 
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
@@ -35,19 +36,30 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        {
                int h = *height;
                int w = *width;
-
+               
+               mlt_position in = mlt_filter_get_in( filter );
+               mlt_position out = mlt_filter_get_out( filter );
+               mlt_position time = mlt_frame_get_position( this );
+               double position = ( double )( time - in ) / ( double )( out - in + 1 );
+               srand(position*10000);
+               
                int noise = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "noise" );
+               double contrast = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "contrast" )/100.0;
+               double brightness = 127.0 * (mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "brightness" )-100.0)/100.0;
+               
                int x=0,y=0,pix=0;
                for (x=0;x<w;x++)
                        for(y=0;y<h;y++){
                                uint8_t* pixel=(*image+(y)*w*2+(x)*2);
                                if (*pixel>20){
-                                       pix=(*pixel)-(rand()%noise-noise);
-                                       if (pix>0 && pix<255)
-                                       *pixel=pix;
+                                       pix= MIN ( MAX ( ( (double)*pixel -127.0  ) * contrast + 127.0 + brightness , 0 ) , 255 ) ;
+                                       if (noise>0)
+                                        pix-=(rand()%noise-noise);
+                                       
+                                       *pixel= MIN ( MAX ( pix , 0 ) , 255 );
                                }
+                               //*(pixel+1)= MIN ( MAX ( ( (double)*(pixel+1) -127.0  ) * .5 + 127.0 , 0 ) , 255 ) ;
                        }
-               
        }
 
        return error;
@@ -67,8 +79,9 @@ mlt_filter filter_grain_init( mlt_profile profile, mlt_service_type type, const
        {
                this->process = filter_process;
                mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "noise", "40" );
+               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "contrast", "160" );
+               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "brightness", "70" );
        }
        return this;
 }
 
-