#include "filter_obscure.h"
#include <framework/mlt_frame.h>
-#include <framework/mlt_deque.h>
#include <stdio.h>
#include <stdlib.h>
/** 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;
}
else
{
+ geometry->x = 0;
+ geometry->y = 0;
+ geometry->w = nw;
+ geometry->h = nh;
geometry->mask_w = 20;
geometry->mask_h = 20;
}
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" );
}
}
- return 0;
+ return error;
}
/** Filter processing.
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 );
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", "" );