* 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>
mlt_filter filter = mlt_frame_pop_service( this );
// Get the image
+ *format = mlt_image_yuv422;
int error = mlt_frame_get_image( this, image, format, width, height, 1 );
// Only process if we have no error and a valid colour space
- if ( error == 0 && *format == mlt_image_yuv422 )
+ if ( error == 0 )
{
// Get the charcoal scatter value
int x_scatter = mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "x_scatter" );
int sum1;
int sum2;
float sum;
+ int val;
// Loop for each row
for ( y = 0; y < *height; y ++ )
*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;
}
}
*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_frame_set_image( this, *image, *width * *height * 2, mlt_pool_release );
}
return error;
/** 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_int( MLT_FILTER_PROPERTIES( this ), "x_scatter", 1 );
+ mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "y_scatter", 1 );
+ mlt_properties_set_double( MLT_FILTER_PROPERTIES( this ), "scale", 1.5 );
+ mlt_properties_set_double( MLT_FILTER_PROPERTIES( this ), "mix", 0.0 );
}
return this;
}