X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fvmfx%2Ffilter_chroma.c;h=7616856c12ad2ac4f154ad0c97e1544d7e7a095f;hb=7ecd47eeebf87332a4892d167baff959f0f6a11a;hp=565ac029964a7a9547f3a5f8d1612f093bf7c8f9;hpb=052a4094e84db1317d143849bb307a8f3c306bab;p=melted

diff --git a/src/modules/vmfx/filter_chroma.c b/src/modules/vmfx/filter_chroma.c
index 565ac02..7616856 100644
--- a/src/modules/vmfx/filter_chroma.c
+++ b/src/modules/vmfx/filter_chroma.c
@@ -4,22 +4,23 @@
  * 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
+ * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program 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.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser 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.
  */
 
-#include "filter_chroma.h"
+#include <framework/mlt_filter.h>
 #include <stdlib.h>
+#include <math.h>
 #include <framework/mlt_factory.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_producer.h>
@@ -27,12 +28,15 @@
 
 static inline int in_range( uint8_t v, uint8_t c, int var )
 {
-	return ( v >= c - var ) && ( v <= c + var );
+	return ( ( int )v >= c - var ) && ( ( int )v <= c + var );
 }
 
-static inline uint8_t alpha_value( uint8_t a, uint8_t *p, uint8_t u, uint8_t v, int var )
+static inline uint8_t alpha_value( uint8_t a, uint8_t *p, uint8_t u, uint8_t v, int var, int odd )
 {
-	return ( in_range( *( p + 1 ), u, var ) && in_range( *( p + 3 ), v, var ) ) ? 0 : a;
+	if ( odd == 0 )
+		return ( in_range( *( p + 1 ), u, var ) && in_range( *( p + 3 ), v, var ) ) ? 0 : a;
+	else
+		return ( in_range( ( *( p + 1 ) + *( p + 5 ) ) / 2, u, var ) && in_range( ( *( p + 3 ) + *( p + 7 ) ) / 2, v, var ) ) ? 0 : a;
 }
 
 /** Get the images and map the chroma to the alpha of the frame.
@@ -42,7 +46,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 {
 	mlt_filter this = mlt_frame_pop_service( frame );
 	char *key = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "key" );
-	int variance = 255 * mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "variance" ) + 0.5;
+	int variance = 200 * mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "variance" );
 	int32_t key_val = strtol( key, &key, 0 );
 	uint8_t b = key_val & 0xff;
 	uint8_t g = ( key_val >> 8 ) & 0xff;
@@ -55,14 +59,14 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 	{
 		uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
 		uint8_t *p = *image;
-		int size = *width * *height;
-		int odd = 0;
+		int size = *width * *height / 2;
 		while ( size -- )
 		{
-			*alpha = alpha_value( *alpha, p, u, v, variance );
-			if ( odd ) p += 4;
-			odd = !odd;
+			*alpha = alpha_value( *alpha, p, u, v, variance, 0 );
 			alpha ++;
+			*alpha = alpha_value( *alpha, p, u, v, variance, 1 );
+			alpha ++;
+			p += 4;
 		}
 	}
 
@@ -82,13 +86,13 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_chroma_init( char *arg )
+mlt_filter filter_chroma_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
 	{
-		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "key", arg == NULL ? "0x00ff00" : arg );
-		mlt_properties_set_double( MLT_FILTER_PROPERTIES( this ), "variance", 0.3 );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "key", arg == NULL ? "0x0000ff" : arg );
+		mlt_properties_set_double( MLT_FILTER_PROPERTIES( this ), "variance", 0.15 );
 		this->process = filter_process;
 	}
 	return this;