struct geometry_s
{
+ int nw;
+ int nh;
float x;
float y;
float w;
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 )
{
// 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 ;-).
/** 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;
}
static void obscure_render( uint8_t *image, int width, int height, struct geometry_s result )
{
- 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;
// 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;
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 );
mlt_properties properties = mlt_filter_properties( this );
mlt_filter_init( this, NULL );
this->process = filter_process;
- mlt_properties_set( properties, "start", "0,0:100x100" );
+ mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" );
mlt_properties_set( properties, "end", "" );
return this;
}