X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_obscure.c;h=7324293fae67de7d09843ac0b47e48e4191ce2ef;hb=f8b2fa8e8e1552b78418d0c2c74f850d322ace69;hp=1867a41ab5de01cd8c73cd2e8586ba2bb4b20304;hpb=75288bcb5a5a3925cf8e94ba12f034a0a8fd6758;p=melted

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index 1867a41..7324293 100644
--- a/src/modules/core/filter_obscure.c
+++ b/src/modules/core/filter_obscure.c
@@ -31,6 +31,8 @@
 
 struct geometry_s
 {
+	int nw;
+	int nh;
 	float x;
 	float y;
 	float w;
@@ -39,11 +41,39 @@ struct geometry_s
 	int mask_h;
 };
 
+/** Parse a value from a geometry string.
+*/
+
+static float parse_value( char **ptr, int normalisation, char delim, float defaults )
+{
+	float value = defaults;
+
+	if ( *ptr != NULL && **ptr != '\0' )
+	{
+		char *end = NULL;
+		value = strtod( *ptr, &end );
+		if ( end != NULL )
+		{
+			if ( *end == '%' )
+				value = ( value / 100.0 ) * normalisation;
+			while ( *end == delim || *end == '%' )
+				end ++;
+		}
+		*ptr = end;
+	}
+
+	return value;
+}
+
 /** Parse a geometry property string.
 */
 
-static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defaults, char *property )
+static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defaults, char *property, int nw, int nh )
 {
+	// Assign normalised width and height
+	geometry->nw = nw;
+	geometry->nh = nh;
+
 	// Assign from defaults if available
 	if ( defaults != NULL )
 	{
@@ -62,7 +92,15 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa
 
 	// Parse the geomtry string
 	if ( property != NULL )
-		sscanf( property, "%f,%f:%fx%f:%dx%d", &geometry->x, &geometry->y, &geometry->w, &geometry->h, &geometry->mask_w, &geometry->mask_h );
+	{
+		char *ptr = property;
+		geometry->x = parse_value( &ptr, nw, ',', geometry->x );
+		geometry->y = parse_value( &ptr, nh, ':', geometry->y );
+		geometry->w = parse_value( &ptr, nw, 'x', geometry->w );
+		geometry->h = parse_value( &ptr, nh, ':', geometry->h );
+		geometry->mask_w = parse_value( &ptr, nw, 'x', geometry->mask_w );
+		geometry->mask_h = parse_value( &ptr, nh, ' ', geometry->mask_h );
+	}
 }
 
 /** A Timism but not as clean ;-).
@@ -80,13 +118,13 @@ static float lerp( float value, float lower, float upper )
 /** Calculate real geometry.
 */
 
-static void geometry_calculate( struct geometry_s *output, struct geometry_s *in, struct geometry_s *out, float position )
+static void geometry_calculate( struct geometry_s *output, struct geometry_s *in, struct geometry_s *out, float position, int ow, int oh )
 {
 	// Calculate this frames geometry
-	output->x = lerp( in->x + ( out->x - in->x ) * position, 0, 100 );
-	output->y = lerp( in->y + ( out->y - in->y ) * position, 0, 100 );
-	output->w = lerp( in->w + ( out->w - in->w ) * position, 0, 100 - output->x );
-	output->h = lerp( in->h + ( out->h - in->h ) * position, 0, 100 - output->y );
+	output->x = lerp( ( in->x + ( out->x - in->x ) * position ) / ( float )out->nw * ow, 0, ow );
+	output->y = lerp( ( in->y + ( out->y - in->y ) * position ) / ( float )out->nh * oh, 0, oh );
+	output->w = lerp( ( in->w + ( out->w - in->w ) * position ) / ( float )out->nw * ow, 0, ow - output->x );
+	output->h = lerp( ( in->h + ( out->h - in->h ) * position ) / ( float )out->nh * oh, 0, oh - output->y );
 	output->mask_w = in->mask_w + ( out->mask_w - in->mask_w ) * position;
 	output->mask_h = in->mask_h + ( out->mask_h - in->mask_h ) * position;
 }
@@ -110,7 +148,7 @@ 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 )
+void obscure_average( uint8_t *start, int width, int height, int stride, uint8_t *alpha )
 {
 	int y;
 	int x;
@@ -133,12 +171,33 @@ void obscure_average( uint8_t *start, int width, int height, int stride )
 	for ( y = 0; y < height; y ++ )
 	{
 		uint8_t *p = start + y * stride;
+		uint8_t *z = alpha;
+		
+		if ( z != NULL )
+			z += y * stride / 2;
+		
 		for ( x = 0; x < width / 2; x ++ )
 		{
-			*p ++ = Y;
-			*p ++ = U;
-			*p ++ = Y;
-			*p ++ = V;
+			if ( z == NULL || ( z != NULL && *z++ > 127 ) )
+			{
+				*p ++ = Y;
+				*p ++ = U;
+			}
+			else
+			{
+				p += 2;
+			}
+				
+			if ( z == NULL || ( z != NULL && *z++ > 127 ) )
+			{
+				
+				*p ++ = Y;
+				*p ++ = V;
+			}
+			else
+			{
+				p += 2;
+			}
 		}
 	}
 }
@@ -147,12 +206,12 @@ void obscure_average( uint8_t *start, int width, int height, int stride )
 /** The obscurer rendering function...
 */
 
-static void obscure_render( uint8_t *image, int width, int height, struct geometry_s result )
+static void obscure_render( uint8_t *image, int width, int height, struct geometry_s result, uint8_t *alpha )
 {
-	int area_x = ( result.x / 100 ) * width;
-	int area_y = ( result.y / 100 ) * height;
-	int area_w = ( result.w / 100 ) * width;
-	int area_h = ( result.h / 100 ) * height;
+	int area_x = result.x;
+	int area_y = result.y;
+	int area_w = result.w;
+	int area_h = result.h;
 
 	int mw = result.mask_w;
 	int mh = result.mask_h;
@@ -160,6 +219,9 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet
 	int h;
 
 	uint8_t *p = image + area_y * width * 2 + area_x * 2;
+	uint8_t *z = alpha;
+	if ( z != NULL )
+		z += area_y * width + area_x;
 
 	for ( w = 0; w < area_w; w += mw )
 	{
@@ -167,8 +229,9 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet
 		{
 			int aw = w + mw > area_w ? mw - ( w + mw - area_w ) : mw;
 			int 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 );
+			if ( aw > 1 && ah > 1 )
+				obscure_average( p + h * width * 2 + w * 2, aw, ah, width * 2,
+					( z == NULL ? z : z + h * width + w ) );
 		}
 	}
 }
@@ -195,6 +258,10 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 			// Get the filter properties
 			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" );
+			int normalised_height = mlt_properties_get_int( frame_properties, "normalised_height" );
+
 			// Structures for geometry
 			struct geometry_s result;
 			struct geometry_s start;
@@ -204,14 +271,14 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 			float position = position_calculate( this, frame );
 
 			// Now parse the geometries
-			geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ) );
-			geometry_parse( &end, &start, mlt_properties_get( properties, "end" ) );
+			geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ), normalised_width, normalised_height );
+			geometry_parse( &end, &start, mlt_properties_get( properties, "end" ), normalised_width, normalised_height );
 
 			// Do the calculation
-			geometry_calculate( &result, &start, &end, position );
+			geometry_calculate( &result, &start, &end, position, *width, *height );
 
 			// Now actually render it
-			obscure_render( *image, *width, *height, result );
+			obscure_render( *image, *width, *height, result, mlt_frame_get_alpha_mask( frame ) );
 		}
 	}
 
@@ -257,7 +324,7 @@ mlt_filter filter_obscure_init( void *arg )
 	mlt_properties properties = mlt_filter_properties( this );
 	mlt_filter_init( this, NULL );
 	this->process = filter_process;
-	mlt_properties_set( properties, "start", "40,40:20x20" );
+	mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" );
 	mlt_properties_set( properties, "end", "" );
 	return this;
 }