X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_obscure.c;h=bf88a09c733322273bae4647ae0aa08e13c0bf14;hb=edfb53ebb1ce5b141e34b7feb7df7448cbc5be96;hp=1867a41ab5de01cd8c73cd2e8586ba2bb4b20304;hpb=75288bcb5a5a3925cf8e94ba12f034a0a8fd6758;p=melted diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c index 1867a41..bf88a09 100644 --- a/src/modules/core/filter_obscure.c +++ b/src/modules/core/filter_obscure.c @@ -21,7 +21,6 @@ #include "filter_obscure.h" #include -#include #include #include @@ -31,6 +30,8 @@ struct geometry_s { + int nw; + int nh; float x; float y; float w; @@ -39,11 +40,39 @@ struct geometry_s 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 ) { @@ -62,7 +91,15 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa // 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 ;-). @@ -80,13 +117,13 @@ static float lerp( float value, float lower, float upper ) /** 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; } @@ -114,13 +151,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; @@ -132,7 +170,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; @@ -149,15 +188,17 @@ void obscure_average( uint8_t *start, int width, int height, int stride ) 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; int w; int h; + int aw; + int ah; uint8_t *p = image + area_y * width * 2 + area_x * 2; @@ -165,9 +206,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 ); } } @@ -181,20 +222,24 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // 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 ); - // 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 ); + // 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; @@ -204,18 +249,18 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format 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 ); } } - return 0; + return error; } /** Filter processing. @@ -223,24 +268,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 ); @@ -253,12 +282,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", "40,40:20x20" ); - 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; }