X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=d9c1bf40c3ff5deb62d2229d0ab45ba689426577;hb=d7ae73d25cf5a38a3a8153ae52409fcbef16bb22;hp=e8f1235bbddf5a8feefead8c1a502fa27e7dd0cc;hpb=037e09bc7cd1c94c73f200d2583dee5a786da810;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index e8f1235..d9c1bf4 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -25,12 +25,14 @@ #include #include #include +#include /** Geometry struct. */ struct geometry_s { + float position; float mix; int nw; // normalised width int nh; // normalised height @@ -42,6 +44,8 @@ struct geometry_s float h; int halign; // horizontal alignment: 0=left, 1=center, 2=right int valign; // vertical alignment: 0=top, 1=middle, 2=bottom + int distort; + struct geometry_s *next; }; /** Parse a value from a geometry string. @@ -75,8 +79,6 @@ static float parse_value( char **ptr, int normalisation, char delim, float defau static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defaults, char *property, int nw, int nh ) { - memset( geometry, 0, sizeof( struct geometry_s ) ); - // Assign normalised width and height geometry->nw = nw; geometry->nh = nh; @@ -88,7 +90,9 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa geometry->y = defaults->y; geometry->w = geometry->sw = defaults->w; geometry->h = geometry->sh = defaults->h; + geometry->distort = defaults->distort; geometry->mix = defaults->mix; + defaults->next = geometry; } else { @@ -96,13 +100,20 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa } // Parse the geomtry string - if ( property != NULL ) + if ( property != NULL && strcmp( property, "" ) ) { char *ptr = property; geometry->x = parse_value( &ptr, nw, ',', geometry->x ); geometry->y = parse_value( &ptr, nh, ':', geometry->y ); geometry->w = geometry->sw = parse_value( &ptr, nw, 'x', geometry->w ); geometry->h = geometry->sh = parse_value( &ptr, nh, ':', geometry->h ); + if ( *ptr == '!' ) + { + geometry->distort = 1; + ptr ++; + if ( *ptr == ':' ) + ptr ++; + } geometry->mix = parse_value( &ptr, 100, ' ', geometry->mix ); } } @@ -110,18 +121,138 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa /** 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, float position ) { + // Search in for position + struct geometry_s *out = in->next; + + if ( position >= 1.0 ) + { + int section = floor( position ); + position -= section; + if ( section % 2 == 1 ) + position = 1.0 - position; + } + + while ( out->next != NULL ) + { + if ( position >= in->position && position < out->position ) + break; + + in = out; + out = in->next; + } + + position = ( position - in->position ) / ( out->position - in->position ); + // Calculate this frames geometry output->nw = in->nw; output->nh = in->nh; - output->x = in->x + ( out->x - in->x ) * position + 0.5; - output->y = in->y + ( out->y - in->y ) * position + 0.5; + 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; output->h = in->h + ( out->h - in->h ) * position; output->mix = in->mix + ( out->mix - in->mix ) * position; - if ( output->mix > 100 ) - fprintf( stderr, "%f = %f + ( %f - %f ) * %f\n", output->mix, in->mix, out->mix, in->mix, position ); + output->distort = in->distort; + + output->x = ( int )floor( output->x ) & 0xfffffffe; + output->w = ( int )floor( output->w ) & 0xfffffffe; + output->sw &= 0xfffffffe; +} + +void transition_destroy_keys( void *arg ) +{ + struct geometry_s *ptr = arg; + struct geometry_s *next = NULL; + + while ( ptr != NULL ) + { + next = ptr->next; + free( ptr ); + ptr = next; + } +} + +static struct geometry_s *transition_parse_keys( mlt_transition this, int normalised_width, int normalised_height ) +{ + // Loop variable for property interrogation + int i = 0; + + // Get the properties of the transition + mlt_properties properties = mlt_transition_properties( this ); + + // Get the in and out position + mlt_position in = mlt_transition_get_in( this ); + mlt_position out = mlt_transition_get_out( this ); + + // Create the start + struct geometry_s *start = calloc( 1, sizeof( struct geometry_s ) ); + + // Create the end (we always need two entries) + struct geometry_s *end = calloc( 1, sizeof( struct geometry_s ) ); + + // Pointer + struct geometry_s *ptr = start; + + // Parse the start property + geometry_parse( start, NULL, mlt_properties_get( properties, "start" ), normalised_width, normalised_height ); + + // Parse the keys in between + for ( i = 0; i < mlt_properties_count( properties ); i ++ ) + { + // Get the name of the property + char *name = mlt_properties_get_name( properties, i ); + + // Check that it's valid + if ( !strncmp( name, "key[", 4 ) ) + { + // Get the value of the property + char *value = mlt_properties_get_value( properties, i ); + + // Determine the frame number + int frame = atoi( name + 4 ); + + // Determine the position + float position = 0; + + if ( frame >= 0 && frame < ( out - in ) ) + position = ( float )frame / ( float )( out - in + 1 ); + else if ( frame < 0 && - frame < ( out - in ) ) + position = ( float )( out - in + frame ) / ( float )( out - in + 1 ); + + // For now, we'll exclude all keys received out of order + if ( position > ptr->position ) + { + // Create a new geometry + struct geometry_s *temp = calloc( 1, sizeof( struct geometry_s ) ); + + // Parse and add to the list + geometry_parse( temp, ptr, value, normalised_width, normalised_height ); + + // Assign the position + temp->position = position; + + // Allow the next to be appended after this one + ptr = temp; + } + else + { + fprintf( stderr, "Key out of order - skipping %s\n", name ); + } + } + } + + // Parse the end + geometry_parse( end, ptr, mlt_properties_get( properties, "end" ), normalised_width, normalised_height ); + if ( out > 0 ) + end->position = ( float )( out - in ) / ( float )( out - in + 1 ); + else + end->position = 1; + + // Assign to properties to ensure we get destroyed + mlt_properties_set_data( properties, "geometries", start, 0, transition_destroy_keys, NULL ); + + return start; } /** Parse the alignment properties into the geometry. @@ -147,14 +278,14 @@ static int alignment_parse( char* align ) static void alignment_calculate( struct geometry_s *geometry ) { - geometry->x += ( geometry->w - geometry->sw ) * geometry->halign / 2 + 0.5; - geometry->y += ( geometry->h - geometry->sh ) * geometry->valign / 2 + 0.5; + geometry->x += ( geometry->w - geometry->sw ) * geometry->halign / 2; + geometry->y += ( geometry->h - geometry->sh ) * geometry->valign / 2; } /** Calculate the position for this frame. */ -static inline float position_calculate( mlt_transition this, mlt_frame frame ) +static float position_calculate( mlt_transition this, mlt_frame frame ) { // Get the in and out position mlt_position in = mlt_transition_get_in( this ); @@ -203,18 +334,16 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, int int i, j; int x_src = 0, y_src = 0; int32_t weight = ( 1 << 16 ) * ( geometry.mix / 100 ); - if ( geometry.mix > 100 ) - fprintf( stderr, "%f %d\n", geometry.mix, weight ); int stride_src = width_src * bpp; int stride_dest = width_dest * bpp; // Adjust to consumer scale - int x = geometry.x * width_dest / geometry.nw + 0.5; - int y = geometry.y * height_dest / geometry.nh + 0.5; + int x = geometry.x * width_dest / geometry.nw; + int y = geometry.y * height_dest / geometry.nh; + + x &= 0xfffffffe; + width_src &= 0xfffffffe; - if ( bpp == 2 ) - x -= x % 2; - // optimization points - no work to do if ( width_src <= 0 || height_src <= 0 ) return ret; @@ -323,24 +452,27 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** int ret = 0; mlt_image_format format = mlt_image_yuv422; - // Initialise the scaled dimensions from the computed - geometry->sw = geometry->w; - geometry->sh = geometry->h; - - // Compute the dimensioning rectangle + // Get the properties objects mlt_properties b_props = mlt_frame_properties( b_frame ); mlt_properties properties = mlt_transition_properties( this ); - if ( mlt_properties_get( properties, "distort" ) == NULL ) + if ( mlt_properties_get( properties, "distort" ) == NULL && geometry->distort == 0 ) { // Adjust b_frame pixel aspect 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 = real_width; int scaled_height = real_height; + double output_sar = ( double ) geometry->nw / geometry->nh / output_ar; + // If the output is fat pixels (NTSC) then stretch our input horizontally + // derived from: output_sar / input_sar * real_width + scaled_width = output_sar * real_height * input_ar; + // Now ensure that our images fit in the normalised frame if ( scaled_width > normalised_width ) { @@ -353,13 +485,22 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** scaled_height = normalised_height; } - // Now we need to align to the geometry - if ( scaled_width <= geometry->w && scaled_height <= geometry->h ) + // Now apply the fill + // TODO: Should combine fill/distort in one property + if ( mlt_properties_get( properties, "fill" ) != NULL ) { - // Save the new scaled dimensions - geometry->sw = scaled_width; - geometry->sh = scaled_height; + scaled_width = ( geometry->w / scaled_width ) * scaled_width; + scaled_height = ( geometry->h / scaled_height ) * scaled_height; } + + // Save the new scaled dimensions + geometry->sw = scaled_width; + geometry->sh = scaled_height; + } + else + { + geometry->sw = geometry->w; + geometry->sh = geometry->h; } // We want to ensure that we bypass resize now... @@ -369,8 +510,8 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** alignment_calculate( geometry ); // Adjust to consumer scale - int x = geometry->x * *width / geometry->nw + 0.5; - int y = geometry->y * *height / geometry->nh + 0.5; + int x = geometry->x * *width / geometry->nw; + int y = geometry->y * *height / geometry->nh; *width = geometry->sw * *width / geometry->nw; *height = geometry->sh * *height / geometry->nh; @@ -389,13 +530,108 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** } -static uint8_t *transition_get_alpha_mask( mlt_frame this ) +struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transition this, mlt_frame a_frame, float position ) +{ + // Get the properties from the transition + mlt_properties properties = mlt_transition_properties( this ); + + // Get the properties from the frame + mlt_properties a_props = mlt_frame_properties( a_frame ); + + // Structures for geometry + struct geometry_s *start = mlt_properties_get_data( properties, "geometries", NULL ); + + // Now parse the geometries + if ( start == NULL ) + { + // 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" ); + + // Parse the transitions properties + start = transition_parse_keys( this, normalised_width, normalised_height ); + } + + // Do the calculation + geometry_calculate( result, start, position ); + + // Now parse the alignment + result->halign = alignment_parse( mlt_properties_get( properties, "halign" ) ); + result->valign = alignment_parse( mlt_properties_get( properties, "valign" ) ); + + return start; +} + +mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame ) { - // Obtain properties of frame - mlt_properties properties = mlt_frame_properties( this ); + // Create a frame to return + mlt_frame b_frame = mlt_frame_init( ); + + // 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 ); + + // Get the position + float position = position_calculate( this, a_frame ); + + // Destination image + uint8_t *dest = NULL; + + // Get the image and dimensions + uint8_t *image = mlt_properties_get_data( a_props, "image", NULL ); + int width = mlt_properties_get_int( a_props, "width" ); + int height = mlt_properties_get_int( a_props, "height" ); - // Return the alpha mask - return mlt_properties_get_data( properties, "alpha", NULL ); + // Pointers for copy operation + uint8_t *p; + uint8_t *q; + uint8_t *r; + + // Corrdinates + int w = 0; + int h = 0; + int x = 0; + int y = 0; + + // Will need to know region to copy + struct geometry_s result; + + // Calculate the region now + composite_calculate( &result, this, a_frame, position ); + + // Need to scale down to actual dimensions + x = result.x * width / result.nw ; + y = result.y * height / result.nh; + w = result.w * width / result.nw; + h = result.h * height / result.nh; + + x &= 0xfffffffe; + w &= 0xfffffffe; + + // Now we need to create a new destination image + dest = mlt_pool_alloc( w * h * 2 ); + + // Copy the region of the image + p = image + y * width * 2 + x * 2; + q = dest; + r = dest + w * h * 2; + + while ( q < r ) + { + memcpy( q, p, w * 2 ); + q += w * 2; + p += width * 2; + } + + // Assign to the new frame + mlt_properties_set_data( b_props, "image", dest, w * h * 2, mlt_pool_release, NULL ); + mlt_properties_set_int( b_props, "width", w ); + mlt_properties_set_int( b_props, "height", h ); + + // Return the frame + return b_frame; } /** Get the image. @@ -406,12 +642,12 @@ 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 transition from the a frame mlt_transition this = mlt_frame_pop_service( 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 ); @@ -428,35 +664,21 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Structures for geometry struct geometry_s result; - struct geometry_s start; - struct geometry_s end; // Calculate the position float position = mlt_properties_get_double( b_props, "relative_position" ); float delta = delta_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" ), normalised_width, normalised_height ); - geometry_parse( &end, &start, mlt_properties_get( properties, "end" ), normalised_width, normalised_height ); - - // Now parse the alignment - result.halign = alignment_parse( mlt_properties_get( properties, "halign" ) ); - result.valign = alignment_parse( mlt_properties_get( properties, "valign" ) ); + // Do the calculation + struct geometry_s *start = composite_calculate( &result, this, a_frame, position ); // 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" ) ); - // Do the calculation - geometry_calculate( &result, &start, &end, position ); - // Get the image from the b frame - uint8_t *image_b; + uint8_t *image_b = NULL; int width_b = *width; int height_b = *height; @@ -476,8 +698,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Assume lower field (0) first float field_position = position + field * delta; - // Do the calculation - geometry_calculate( &result, &start, &end, field_position ); + // Do the calculation if we need to + geometry_calculate( &result, start, field_position ); // Align alignment_calculate( &result ); @@ -514,7 +736,6 @@ mlt_transition transition_composite_init( char *arg ) { this->process = composite_process; 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; }