* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "filter_obscure.h"
-
+#include <framework/mlt_filter.h>
#include <framework/mlt_frame.h>
+#include <framework/mlt_profile.h>
#include <stdio.h>
#include <stdlib.h>
{
if ( *end == '%' )
value = ( value / 100.0 ) * normalisation;
- while ( *end == delim || *end == '%' )
+ while ( *end == delim || *end == '%' || ( delim == ',' && *end == '/' ) )
end ++;
}
*ptr = end;
{
if ( value < lower )
return lower;
- else if ( value > upper )
+ else if ( upper > lower && value > upper )
return upper;
return value;
}
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;
-}
-
-/** Calculate the position for this frame.
-*/
-
-static float position_calculate( mlt_filter this, mlt_frame frame )
-{
- // Get the in and out position
- mlt_position in = mlt_filter_get_in( this );
- mlt_position out = mlt_filter_get_out( this );
-
- // Get the position of the frame
- mlt_position position = mlt_frame_get_position( frame );
-
- // Now do the calcs
- return ( float )( position - in ) / ( float )( out - in + 1 );
+ output->mask_w = lerp( in->mask_w + ( out->mask_w - in->mask_w ) * position, 1, -1 );
+ output->mask_h = lerp( in->mask_h + ( out->mask_h - in->mask_h ) * position, 1, -1 );
}
/** The averaging function...
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 );
-
// Pop the top of stack now
- mlt_filter this = mlt_frame_pop_service( frame );
+ mlt_filter filter = mlt_frame_pop_service( frame );
// Get the image from the frame
+ *format = mlt_image_yuv422;
int error = mlt_frame_get_image( frame, image, format, width, height, 1 );
// Get the image from the frame
- if ( error == 0 && *format == mlt_image_yuv422 )
+ if ( error == 0 )
{
- if ( this != NULL )
+ if ( filter != NULL )
{
// 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" );
+ mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+ mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( filter ) );
// Structures for geometry
struct geometry_s result;
struct geometry_s end;
// Retrieve the position
- float position = mlt_properties_get_double(frame_properties, "filter_position");
+ float position = mlt_filter_get_progress( filter, frame );
// Now parse the geometries
- 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 );
+ geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ), profile->width, profile->height );
+ geometry_parse( &end, &start, mlt_properties_get( properties, "end" ), profile->width, profile->height );
// Do the calculation
geometry_calculate( &result, &start, &end, position, *width, *height );
/** Filter processing.
*/
-static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
+static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
{
// Push this on to the service stack
- mlt_frame_push_service( frame, this );
+ mlt_frame_push_service( frame, filter );
- // Calculate the position for the filter effect
- float position = position_calculate( this, frame );
- mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "filter_position", position );
-
// Push the get image call
mlt_frame_push_get_image( frame, filter_get_image );
/** Constructor for the filter.
*/
-mlt_filter filter_obscure_init( void *arg )
+mlt_filter filter_obscure_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
- mlt_filter this = mlt_filter_new( );
- if ( this != NULL )
+ mlt_filter filter = mlt_filter_new( );
+ if ( filter != 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 properties = MLT_FILTER_PROPERTIES( filter );
+ filter->process = filter_process;
+ mlt_properties_set( properties, "start", arg != NULL ? arg : "0%/0%:100%x100%" );
mlt_properties_set( properties, "end", "" );
}
- return this;
+ return filter;
}
projects / mlt / blobdiff