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

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index e6e7c71..bf88a09 100644
--- a/src/modules/core/filter_obscure.c
+++ b/src/modules/core/filter_obscure.c
@@ -21,7 +21,6 @@
 #include "filter_obscure.h"
 
 #include <framework/mlt_frame.h>
-#include <framework/mlt_deque.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -152,13 +151,14 @@ void obscure_average( uint8_t *start, int width, int height, int stride )
 {
 	int y;
 	int x;
-	int Y = ( *start + *( start + 2 ) ) / 2;
-	int U = *( start + 1 );
-	int V = *( start + 3 );
+	register int Y = ( *start + *( start + 2 ) ) / 2;
+	register int U = *( start + 1 );
+	register int V = *( start + 3 );
+	register uint8_t *p;
 
 	for ( y = 0; y < height; y ++ )
 	{
-		uint8_t *p = start + y * stride;
+		p = start + y * stride;
 		for ( x = 0; x < width / 2; x ++ )
 		{
 			Y = ( Y + *p ++ ) / 2;
@@ -170,7 +170,8 @@ void obscure_average( uint8_t *start, int width, int height, int stride )
 
 	for ( y = 0; y < height; y ++ )
 	{
-		uint8_t *p = start + y * stride;
+		p = start + y * stride;
+		
 		for ( x = 0; x < width / 2; x ++ )
 		{
 			*p ++ = Y;
@@ -196,6 +197,8 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet
 	int mh = result.mask_h;
 	int w;
 	int h;
+	int aw;
+	int ah;
 
 	uint8_t *p = image + area_y * width * 2 + area_x * 2;
 
@@ -203,9 +206,9 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet
 	{
 		for ( h = 0; h < area_h; h += mh )
 		{
-			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 );
+			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 );
 		}
 	}
@@ -219,14 +222,14 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 	// Get the frame properties
 	mlt_properties frame_properties = mlt_frame_properties( frame );
 
-	// Fetch the obscure stack for this frame
-	mlt_deque deque = mlt_properties_get_data( frame_properties, "filter_obscure", NULL );
-
 	// Pop the top of stack now
-	mlt_filter this = mlt_deque_pop_back( deque );
+	mlt_filter this = mlt_frame_pop_service( frame );
+
+	// Get the image from the frame
+	int error = mlt_frame_get_image( frame, image, format, width, height, 1 );
 
 	// Get the image from the frame
-	if ( mlt_frame_get_image( frame, image, format, width, height, 1 ) == 0 )
+	if ( error == 0 && *format == mlt_image_yuv422 )
 	{
 		if ( this != NULL )
 		{
@@ -257,7 +260,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 		}
 	}
 
-	return 0;
+	return error;
 }
 
 /** Filter processing.
@@ -265,24 +268,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
-	// Get the frame properties
-	mlt_properties frame_properties = mlt_frame_properties( frame );
-
-	// Fetch the obscure stack for this frame
-	mlt_deque deque = mlt_properties_get_data( frame_properties, "filter_obscure", NULL );
-
-	// Create stack if necessary
-	if ( deque == NULL )
-	{
-		// Create the deque
-		deque = mlt_deque_init( );
-
-		// Assign to the frame
-		mlt_properties_set_data( frame_properties, "filter_obscure", deque, 0, ( mlt_destructor )mlt_deque_close, NULL );
-	}
-
-	// Push this on to the obscure stack
-	mlt_deque_push_back( deque, this );
+	// Push this on to the service stack
+	mlt_frame_push_service( frame, this );
 	
 	// Push the get image call
 	mlt_frame_push_get_image( frame, filter_get_image );
@@ -295,12 +282,14 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 
 mlt_filter filter_obscure_init( void *arg )
 {
-	mlt_filter this = calloc( 1, sizeof( struct mlt_filter_s ) );
-	mlt_properties properties = mlt_filter_properties( this );
-	mlt_filter_init( this, NULL );
-	this->process = filter_process;
-	mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" );
-	mlt_properties_set( properties, "end", "" );
+	mlt_filter this = mlt_filter_new( );
+	if ( this != NULL )
+	{
+		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", "" );
+	}
 	return this;
 }