X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_obscure.c;h=d5521981472dad89b59382dccccebe38333ae99b;hb=bac7cd7749bf743543e2e4f2897bbc1fe3f192c0;hp=bf88a09c733322273bae4647ae0aa08e13c0bf14;hpb=037e09bc7cd1c94c73f200d2583dee5a786da810;p=melted

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index bf88a09..d552198 100644
--- a/src/modules/core/filter_obscure.c
+++ b/src/modules/core/filter_obscure.c
@@ -43,7 +43,7 @@ struct geometry_s
 /** Parse a value from a geometry string.
 */
 
-static float parse_value( char **ptr, int normalisation, char delim, float defaults )
+static inline float parse_value( char **ptr, int normalisation, char delim, float defaults )
 {
 	float value = defaults;
 
@@ -85,6 +85,10 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa
 	}
 	else
 	{
+		geometry->x = 0;
+		geometry->y = 0;
+		geometry->w = nw;
+		geometry->h = nh;
 		geometry->mask_w = 20;
 		geometry->mask_h = 20;
 	}
@@ -147,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;
 	}
 }
 
@@ -209,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 );
 		}
 	}
 }
@@ -220,7 +231,7 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet
 static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	// Get the frame properties
-	mlt_properties frame_properties = mlt_frame_properties( frame );
+	mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
 
 	// Pop the top of stack now
 	mlt_filter this = mlt_frame_pop_service( frame );
@@ -234,7 +245,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 		if ( this != NULL )
 		{
 			// Get the filter properties
-			mlt_properties properties = mlt_filter_properties( this );
+			mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 
 			// Obtain the normalised width and height from the frame
 			int normalised_width = mlt_properties_get_int( frame_properties, "normalised_width" );
@@ -285,7 +296,7 @@ mlt_filter filter_obscure_init( void *arg )
 	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
 	{
-		mlt_properties properties = mlt_filter_properties( this );
+		mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 		this->process = filter_process;
 		mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" );
 		mlt_properties_set( properties, "end", "" );