X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fplus%2Ffilter_charcoal.c;h=e99981a56add6ddeb096bb95e24eb8574224f39b;hb=e89b21b07607ae485f56b32f3e67f83f528f2ae6;hp=58f403b512a6fcc7fa78131f81f2dcb10f726559;hpb=997280680f5919d68b275416bb9515a7a707709f;p=melted

diff --git a/src/modules/plus/filter_charcoal.c b/src/modules/plus/filter_charcoal.c
index 58f403b..e99981a 100644
--- a/src/modules/plus/filter_charcoal.c
+++ b/src/modules/plus/filter_charcoal.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_charcoal.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -79,11 +78,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 +100,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 +127,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 +137,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;
@@ -156,16 +158,16 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_charcoal_init( char *arg )
+mlt_filter filter_charcoal_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	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;
 }