X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_obscure.c;h=ccd108a3e70af7e3b24882da07863ab6f6c9abd5;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=ae70e106f40a33fa9ac3a894a9cd72cfe903e429;hpb=4a16e2d841d4b567d658a35350fe579ea4c8c4ff;p=melted

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index ae70e10..ccd108a 100644
--- a/src/modules/core/filter_obscure.c
+++ b/src/modules/core/filter_obscure.c
@@ -3,19 +3,19 @@
  * 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_obscure.h"
@@ -151,38 +151,45 @@ static float position_calculate( mlt_filter this, mlt_frame frame )
 /** The averaging function...
 */
 
-void obscure_average( uint8_t *start, int width, int height, int stride )
+static inline void obscure_average( uint8_t *start, int width, int height, int stride )
 {
-	int y;
-	int x;
+	register int y;
+	register int x;
 	register int Y = ( *start + *( start + 2 ) ) / 2;
 	register int U = *( start + 1 );
 	register int V = *( start + 3 );
 	register uint8_t *p;
+	register int components = width >> 1;
 
-	for ( y = 0; y < height; y ++ )
+	y = height;
+	while( y -- )
 	{
-		p = start + y * stride;
-		for ( x = 0; x < width / 2; x ++ )
+		p = start;
+		x = components;
+		while( x -- )
 		{
-			Y = ( Y + *p ++ ) / 2;
-			U = ( U + *p ++ ) / 2;
-			Y = ( Y + *p ++ ) / 2;
-			V = ( V + *p ++ ) / 2;
+			Y = ( Y + *p ++ ) >> 1;
+			U = ( U + *p ++ ) >> 1;
+			Y = ( Y + *p ++ ) >> 1;
+			V = ( V + *p ++ ) >> 1;
 		}
+		start += stride;
 	}
 
-	for ( y = 0; y < height; y ++ )
+	start -= height * stride;
+	y = height;
+	while( y -- )
 	{
-		p = start + y * stride;
-		
-		for ( x = 0; x < width / 2; x ++ )
+		p = start;
+		x = components;
+		while( x -- )
 		{
 			*p ++ = Y;
 			*p ++ = U;
 			*p ++ = Y;
 			*p ++ = V;
 		}
+		start += stride;
 	}
 }
 
@@ -213,7 +220,7 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet
 			aw = w + mw > area_w ? mw - ( w + mw - area_w ) : mw;
 			ah = h + mh > area_h ? mh - ( h + mh - area_h ) : mh;
 			if ( aw > 1 && ah > 1 )
-				obscure_average( p + h * width * 2 + w * 2, aw, ah, width * 2 );
+				obscure_average( p + h * ( width << 1 ) + ( w << 1 ), aw, ah, width << 1 );
 		}
 	}
 }
@@ -249,8 +256,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 			struct geometry_s start;
 			struct geometry_s end;
 
-			// Calculate the position
-			float position = position_calculate( this, frame );
+			// Retrieve the position
+			float position = mlt_properties_get_double(frame_properties, "filter_position");
 
 			// Now parse the geometries
 			geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ), normalised_width, normalised_height );
@@ -275,6 +282,10 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	// Push this on to the service stack
 	mlt_frame_push_service( frame, this );
 	
+	// Calculate the position for the filter effect
+	float position = position_calculate( this, frame );
+	mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "filter_position", position );
+
 	// Push the get image call
 	mlt_frame_push_get_image( frame, filter_get_image );