X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=49f7c940128f5f8c024d571d53e7b72c8c42116a;hb=6405eb05b56e753e9ab7c9ac2c16826d3a0c0ec5;hp=2903bb0300bf53b0fc6f894764d2fe617dcef27b;hpb=acebb83a8ead55799505891f9a95be4eead9eb49;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 2903bb0..49f7c94 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -29,6 +29,8 @@ struct geometry_s { + int nw; + int nh; float x; float y; float w; @@ -36,11 +38,41 @@ struct geometry_s float mix; }; -/** Parse a geometry property string. +/** Parse a value from a geometry string. */ -static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defaults, char *property ) +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 with the syntax X,Y:WxH:MIX. Any value can be + expressed as a percentage by appending a % after the value, otherwise values are + assumed to be relative to the normalised dimensions of the consumer. +*/ + +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 ) { @@ -57,7 +89,14 @@ 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:%f", &geometry->x, &geometry->y, &geometry->w, &geometry->h, &geometry->mix ); + { + 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->mix = parse_value( &ptr, 100, ' ', geometry->mix ); + } } /** Calculate real geometry. @@ -66,6 +105,8 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa static void geometry_calculate( struct geometry_s *output, struct geometry_s *in, struct geometry_s *out, float position ) { // Calculate this frames geometry + output->nw = in->nw; + output->nh = in->nh; output->x = in->x + ( out->x - in->x ) * position; output->y = in->y + ( out->y - in->y ) * position; output->w = in->w + ( out->w - in->w ) * position; @@ -89,39 +130,37 @@ static float position_calculate( mlt_transition this, mlt_frame frame ) return ( float )( position - in ) / ( float )( out - in + 1 ); } +static int get_value( mlt_properties properties, char *preferred, char *fallback ) +{ + int value = mlt_properties_get_int( properties, preferred ); + if ( value == 0 ) + value = mlt_properties_get_int( properties, fallback ); + return value; +} + /** Composite function. */ -static int composite_yuv( uint8_t *p_dest, mlt_image_format format_dest, int width_dest, int height_dest, mlt_frame that, struct geometry_s geometry ) +static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *p_alpha, struct geometry_s geometry ) { int ret = 0; - uint8_t *p_src; int i, j; - int stride_src; - int stride_dest; int x_src = 0, y_src = 0; - - mlt_image_format format_src = format_dest; - int x = ( int )( ( float )width_dest * geometry.x / 100 ); - int y = ( int )( ( float )height_dest * geometry.y / 100 ); float weight = geometry.mix / 100; - int width_src = ( int )( ( float )width_dest * geometry.w / 100 ); - int height_src = ( int )( ( float )height_dest * geometry.h / 100 ); + int x = ( geometry.x * width_dest ) / geometry.nw; + int y = ( geometry.y * height_dest ) / geometry.nh; + int stride_src = width_src * 2; + int stride_dest = width_dest * 2; x -= x % 2; - // optimization point - no work to do - if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) ) + // optimization points - no work to do + if ( width_src <= 0 || height_src <= 0 ) return ret; - format_src = mlt_image_yuv422; - format_dest = mlt_image_yuv422; - - mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 1 /* writable */ ); + if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) ) + return ret; - stride_src = width_src * 2; - stride_dest = width_dest * 2; - // crop overlay off the left edge of frame if ( x < 0 ) { @@ -150,9 +189,6 @@ static int composite_yuv( uint8_t *p_dest, mlt_image_format format_dest, int wid // offset pointer into frame buffer based upon positive, even coordinates only! p_dest += ( x < 0 ? 0 : x ) * 2 + ( y < 0 ? 0 : y ) * stride_dest; - // Get the alpha channel of the overlay - uint8_t *p_alpha = mlt_frame_get_alpha_mask( that ); - // offset pointer into alpha channel based upon cropping if ( p_alpha ) p_alpha += x_src + y_src * stride_src / 2; @@ -195,6 +231,92 @@ static int composite_yuv( uint8_t *p_dest, mlt_image_format format_dest, int wid } +/** Get the properly sized image from b_frame. +*/ + +static int get_b_frame_image( mlt_frame b_frame, uint8_t **image, int *width, int *height, struct geometry_s *geometry ) +{ + int ret = 0; + mlt_image_format format = mlt_image_yuv422; + + // Compute the dimensioning rectangle + mlt_properties b_props = mlt_frame_properties( b_frame ); + mlt_transition this = mlt_properties_get_data( b_props, "transition_composite", NULL ); + mlt_properties properties = mlt_transition_properties( this ); + + if ( mlt_properties_get( properties, "distort" ) == NULL ) + { + // Now do additional calcs based on real_width/height etc + //int normalised_width = mlt_properties_get_int( b_props, "normalised_width" ); + //int normalised_height = mlt_properties_get_int( b_props, "normalised_height" ); + int normalised_width = geometry->w; + int normalised_height = geometry->h; + int real_width = get_value( b_props, "real_width", "width" ); + int real_height = get_value( b_props, "real_height", "height" ); + double input_ar = mlt_frame_get_aspect_ratio( b_frame ); + double output_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" ); + int scaled_width = ( input_ar > output_ar ? input_ar / output_ar : output_ar / input_ar ) * real_width; + int scaled_height = ( input_ar > output_ar ? input_ar / output_ar : output_ar / input_ar ) * real_height; + + // Now ensure that our images fit in the normalised frame + if ( scaled_width > normalised_width ) + { + scaled_height = scaled_height * normalised_width / scaled_width; + scaled_width = normalised_width; + } + if ( scaled_height > normalised_height ) + { + scaled_width = scaled_width * normalised_height / scaled_height; + scaled_height = normalised_height; + } + + // Special case + if ( scaled_height == normalised_height ) + scaled_width = normalised_width; + + // Now we need to align to the geometry + if ( scaled_width <= geometry->w && scaled_height <= geometry->h ) + { + // TODO: Should take into account requested alignment here... + // Assume centred alignment for now + + geometry->x = geometry->x + ( geometry->w - scaled_width ) / 2; + geometry->y = geometry->y + ( geometry->h - scaled_height ) / 2; + geometry->w = scaled_width; + geometry->h = scaled_height; + mlt_properties_set( b_props, "distort", "true" ); + } + else + { + mlt_properties_set( b_props, "distort", "true" ); + } + } + else + { + // We want to ensure that we bypass resize now... + mlt_properties_set( b_props, "distort", "true" ); + } + + int x = ( geometry->x * *width ) / geometry->nw; + int y = ( geometry->y * *height ) / geometry->nh; + *width = ( geometry->w * *width ) / geometry->nw; + *height = ( geometry->h * *height ) / geometry->nh; + + x -= x % 2; + + // optimization points - no work to do + if ( *width <= 0 || *height <= 0 ) + return 1; + + if ( ( x < 0 && -x >= *width ) || ( y < 0 && -y >= *height ) ) + return 1; + + ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 /* writable */ ); + + return ret; +} + + /** Get the image. */ @@ -203,11 +325,17 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Get the b frame from the stack mlt_frame b_frame = mlt_frame_pop_frame( a_frame ); + // This compositer is yuv422 only + *format = mlt_image_yuv422; + // Get the image from the a frame mlt_frame_get_image( a_frame, image, format, width, height, 1 ); if ( b_frame != NULL ) { + // Get the properties of the a frame + mlt_properties a_props = mlt_frame_properties( a_frame ); + // Get the properties of the b frame mlt_properties b_props = mlt_frame_properties( b_frame ); @@ -225,15 +353,33 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Calculate the position float position = position_calculate( this, a_frame ); + // Obtain the normalised width and height from the a_frame + int normalised_width = mlt_properties_get_int( a_props, "normalised_width" ); + int normalised_height = mlt_properties_get_int( a_props, "normalised_height" ); + // 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 ); - // Composite the b_frame on the a_frame - composite_yuv( *image, *format, *width, *height, b_frame, result ); + // Since we are the consumer of the b_frame, we must pass along these + // consumer properties from the a_frame + mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + mlt_properties_set_double( b_props, "consumer_scale", mlt_properties_get_double( a_props, "consumer_scale" ) ); + + // Get the image from the b frame + uint8_t *image_b; + int width_b = *width; + int height_b = *height; + if ( get_b_frame_image( b_frame, &image_b, &width_b, &height_b, &result ) == 0 ) + { + uint8_t *alpha = mlt_frame_get_alpha_mask( b_frame ); + + // Composite the b_frame on the a_frame + composite_yuv( *image, *width, *height, image_b, width_b, height_b, alpha, result ); + } } return 0; @@ -261,7 +407,7 @@ mlt_transition transition_composite_init( char *arg ) if ( this != NULL && mlt_transition_init( this, NULL ) == 0 ) { this->process = composite_process; - mlt_properties_set( mlt_transition_properties( this ), "start", arg != NULL ? arg : "85,5:10x10" ); + mlt_properties_set( mlt_transition_properties( this ), "start", arg != NULL ? arg : "85%,5%:10%x10%" ); mlt_properties_set( mlt_transition_properties( this ), "end", "" ); } return this;