+ Bounds checking on chroma samples

[melted] / src / modules / plus / filter_charcoal.c

diff --git a/src/modules/plus/filter_charcoal.c b/src/modules/plus/filter_charcoal.c
index 58f403b..f48f37f 100644 (file)
--- a/src/modules/plus/filter_charcoal.c
+++ b/src/modules/plus/filter_charcoal.c
@@ -79,11 +79,11 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        if ( error == 0 && *format == mlt_image_yuv422 )
        {
                // Get the charcoal scatter value
-               int x_scatter = mlt_properties_get_double( mlt_filter_properties( filter ), "x_scatter" );
-               int y_scatter = mlt_properties_get_double( mlt_filter_properties( filter ), "y_scatter" );
-               float scale = mlt_properties_get_double( mlt_filter_properties( filter ), "scale" );
-               float mix = mlt_properties_get_double( mlt_filter_properties( filter ), "mix" );
-               int invert = mlt_properties_get_int( mlt_filter_properties( filter ), "invert" );
+               int x_scatter = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "x_scatter" );
+               int y_scatter = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "y_scatter" );
+               float scale = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "scale" );
+               float mix = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "mix" );
+               int invert = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "invert" );
 
                // We'll process pixel by pixel
                int x = 0;
@@ -101,6 +101,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                int sum1;
                int sum2;
                float sum;
+               int val;
 
                // Loop for each row
                for ( y = 0; y < *height; y ++ )
@@ -127,7 +128,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                                *p ++ = !invert ? ( sum >= 16 && sum <= 235 ? 251 - sum : sum < 16 ? 235 : 16 ) :
                                                                  ( sum >= 16 && sum <= 235 ? sum : sum < 16 ? 16 : 235 );
                                q ++;
-                               *p ++ = 128 + mix * ( *q ++ - 128 );
+                               val = 128 + mix * ( *q ++ - 128 );
+                               val = val < 16 ? 16 : val > 240 ? 240 : val;
+                               *p ++ = val;
                        }
                }
 
@@ -135,7 +138,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                *image = temp;
 
                // Store new and destroy old
-               mlt_properties_set_data( mlt_frame_properties( this ), "image", *image, *width * *height * 2, mlt_pool_release, NULL );
+               mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", *image, *width * *height * 2, mlt_pool_release, NULL );
        }
 
        return error;
@@ -162,10 +165,10 @@ mlt_filter filter_charcoal_init( char *arg )
        if ( this != NULL )
        {
                this->process = filter_process;
-               mlt_properties_set( mlt_filter_properties( this ), "x_scatter", "1" );
-               mlt_properties_set( mlt_filter_properties( this ), "y_scatter", "1" );
-               mlt_properties_set( mlt_filter_properties( this ), "scale", "1.5" );
-               mlt_properties_set( mlt_filter_properties( this ), "mix", "0" );
+               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "x_scatter", "1" );
+               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "y_scatter", "1" );
+               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "scale", "1.5" );
+               mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "mix", "0" );
        }
        return this;
 }