* 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>
}
else
{
- uint8_t *pixel = pixels + y * width * 2 + x * 2;
+ uint8_t *pixel = pixels + y * ( width << 1 ) + ( x << 1 );
return *pixel;
}
}
int h = 0;
while( q <= n )
- q = 4 * q;
+ q = q << 2;
while( q != 1 )
{
- q = q / 4;
+ q = q >> 2;
h = p + q;
- p = p / 2;
+ p = p >> 1;
if ( r >= h )
{
p = p + q;
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;
int sum1;
int sum2;
float sum;
+ int val;
// Loop for each row
for ( y = 0; y < *height; y ++ )
matrix[ 2 ][ 2 ] = get_Y( *image, *width, *height, x + x_scatter, y + y_scatter );
// Do calculations
- sum1 = (matrix[2][0] - matrix[0][0]) + 2*(matrix[2][1] - matrix[0][1]) + (matrix[2][2] - matrix[2][0]);
- sum2 = (matrix[0][2] - matrix[0][0]) + 2*(matrix[1][2] - matrix[1][0]) + (matrix[2][2] - matrix[2][0]);
+ sum1 = (matrix[2][0] - matrix[0][0]) + ( (matrix[2][1] - matrix[0][1]) << 1 ) + (matrix[2][2] - matrix[2][0]);
+ sum2 = (matrix[0][2] - matrix[0][0]) + ( (matrix[1][2] - matrix[1][0]) << 1 ) + (matrix[2][2] - matrix[2][0]);
sum = scale * sqrti( sum1 * sum1 + sum2 * sum2 );
// Assign value
*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_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", *image, *width * *height * 2, mlt_pool_release, NULL );
}
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( 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;
}
projects / melted / blobdiff