Feeds pseudo module added

[mlt] / src / modules / core / filter_obscure.c

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index e6e7c718048cbda64f02fbdb4151be07772c1351..ae70e106f40a33fa9ac3a894a9cd72cfe903e429 100644 (file)
--- 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>
@@ -44,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;
 
@@ -86,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;
        }
@@ -152,13 +155,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 +174,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 +201,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 +210,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 );
                }
        }
@@ -217,21 +224,21 @@ 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 );
-
-       // Fetch the obscure stack for this frame
-       mlt_deque deque = mlt_properties_get_data( frame_properties, "filter_obscure", NULL );
+       mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
 
        // 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 )
                {
                        // 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" );
@@ -257,7 +264,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                }
        }
 
-       return 0;
+       return error;
 }
 
 /** Filter processing.
@@ -265,24 +272,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 +286,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;
 }