* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates <charles.yates@pandora.be>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "filter_obscure.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;
}
/** The averaging function...
*/
-void obscure_average( uint8_t *start, int width, int height, int stride )
+static inline void obscure_average( uint8_t *start, int width, int height, int stride )
{
- int y;
- int x;
+ register int y;
+ register int x;
register int Y = ( *start + *( start + 2 ) ) / 2;
register int U = *( start + 1 );
register int V = *( start + 3 );
register uint8_t *p;
+ register int components = width >> 1;
- for ( y = 0; y < height; y ++ )
+ y = height;
+ while( y -- )
{
- p = start + y * stride;
- for ( x = 0; x < width / 2; x ++ )
+ p = start;
+ x = components;
+ while( x -- )
{
- Y = ( Y + *p ++ ) / 2;
- U = ( U + *p ++ ) / 2;
- Y = ( Y + *p ++ ) / 2;
- V = ( V + *p ++ ) / 2;
+ Y = ( Y + *p ++ ) >> 1;
+ U = ( U + *p ++ ) >> 1;
+ Y = ( Y + *p ++ ) >> 1;
+ V = ( V + *p ++ ) >> 1;
}
+ start += stride;
}
- for ( y = 0; y < height; y ++ )
+ start -= height * stride;
+ y = height;
+ while( y -- )
{
- p = start + y * stride;
-
- for ( x = 0; x < width / 2; x ++ )
+ p = start;
+ x = components;
+ while( x -- )
{
*p ++ = Y;
*p ++ = U;
*p ++ = Y;
*p ++ = V;
}
+ start += stride;
}
}
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 );
+ obscure_average( p + h * ( width << 1 ) + ( w << 1 ), aw, ah, width << 1 );
}
}
}
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 );
+ mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
// Pop the top of stack now
mlt_filter this = mlt_frame_pop_service( frame );
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" );
struct geometry_s start;
struct geometry_s end;
- // Calculate the position
- float position = position_calculate( this, frame );
+ // Retrieve the position
+ float position = mlt_properties_get_double(frame_properties, "filter_position");
// Now parse the geometries
geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ), normalised_width, normalised_height );
// Push this on to the service stack
mlt_frame_push_service( frame, this );
+ // 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 );
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", "" );
projects / melted / blobdiff