X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=1b4c5eec557a18ab7edc64dd941d496d3a23328d;hb=1f6faabf5ef11e6321d186772d88fb6958cdd057;hp=fafe387f568380f43344bce9205f4101d32519d6;hpb=0a763f7b10f28184bba59fd8cecbc29999c131ef;p=mlt diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index fafe387f..1b4c5eec 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -27,172 +27,65 @@ #include #include -typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness ); - -/* mmx function declarations */ -#ifdef USE_MMX - void composite_line_yuv_mmx( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness ); - int composite_have_mmx( void ); -#endif +typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness ); /** Geometry struct. */ struct geometry_s { - int frame; - float position; - float mix; + struct mlt_geometry_item_s item; int nw; // normalised width int nh; // normalised height int sw; // scaled width, not including consumer scale based upon w/nw int sh; // scaled height, not including consumer scale based upon h/nh - float x; - float y; - float w; - 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. -*/ - -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. +/** Parse the alignment properties into the geometry. */ -static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defaults, char *property, int nw, int nh ) +static int alignment_parse( char* align ) { - // Assign normalised width and height - geometry->nw = nw; - geometry->nh = nh; - - // Assign from defaults if available - if ( defaults != NULL ) - { - geometry->x = defaults->x; - 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 - { - geometry->mix = 100; - } + int ret = 0; + + if ( align == NULL ); + else if ( isdigit( align[ 0 ] ) ) + ret = atoi( align ); + else if ( align[ 0 ] == 'c' || align[ 0 ] == 'm' ) + ret = 1; + else if ( align[ 0 ] == 'r' || align[ 0 ] == 'b' ) + ret = 2; - // Parse the geomtry string - 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 ); - } + return ret; } /** Calculate real geometry. */ -static void geometry_calculate( struct geometry_s *output, struct geometry_s *in, float position ) +static void geometry_calculate( mlt_transition this, struct geometry_s *output, double 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 ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + mlt_geometry geometry = mlt_properties_get_data( properties, "geometries", NULL ); + int mirror_off = mlt_properties_get_int( properties, "mirror_off" ); + int repeat_off = mlt_properties_get_int( properties, "repeat_off" ); + int length = mlt_geometry_get_length( geometry ); - // Calculate this frames geometry - if ( in->frame != out->frame - 1 ) - { - output->nw = in->nw; - output->nh = in->nh; - output->x = rint( in->x + ( out->x - in->x ) * position + 0.5 ); - output->y = rint( in->y + ( out->y - in->y ) * position + 0.5 ); - output->w = rint( in->w + ( out->w - in->w ) * position + 0.5 ); - output->h = rint( in->h + ( out->h - in->h ) * position + 0.5 ); - output->mix = in->mix + ( out->mix - in->mix ) * position; - output->distort = in->distort; - } - else + // Allow wrapping + if ( !repeat_off && position >= length && length != 0 ) { - output->nw = out->nw; - output->nh = out->nh; - output->x = out->x; - output->y = out->y; - output->w = out->w; - output->h = out->h; - output->mix = out->mix; - output->distort = out->distort; + int section = position / length; + position -= section * length; + if ( !mirror_off && section % 2 == 1 ) + position = length - position; } -} - -static 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; - } + // Fetch the key for the position + mlt_geometry_fetch( geometry, &output->item, position ); } -static struct geometry_s *transition_parse_keys( mlt_transition this, int normalised_width, int normalised_height ) +static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_width, int normalised_height ) { // Loop variable for property interrogation int i = 0; @@ -200,94 +93,72 @@ static struct geometry_s *transition_parse_keys( mlt_transition this, int norma // Get the properties of the transition mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + // Create an empty geometries object + mlt_geometry geometry = mlt_geometry_init( ); + // Get the in and out position mlt_position in = mlt_transition_get_in( this ); mlt_position out = mlt_transition_get_out( this ); + int length = out - in + 1; + double cycle = mlt_properties_get_double( properties, "cycle" ); - // Create the start - struct geometry_s *start = calloc( 1, sizeof( struct geometry_s ) ); + // Get the new style geometry string + char *property = mlt_properties_get( properties, "geometry" ); - // Create the end (we always need two entries) - struct geometry_s *end = calloc( 1, sizeof( struct geometry_s ) ); + // Allow a geometry repeat cycle + if ( cycle >= 1 ) + length = cycle; + else if ( cycle > 0 ) + length *= cycle; - // Pointer - struct geometry_s *ptr = start; + // Parse the geometry if we have one + mlt_geometry_parse( geometry, property, length, normalised_width, normalised_height ); - // 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 ++ ) + // Check if we're using the old style geometry + if ( property == NULL ) { - // Get the name of the property - char *name = mlt_properties_get_name( properties, i ); + // DEPRECATED: Multiple keys for geometry information is inefficient and too rigid for + // practical use - while deprecated, it has been slightly extended too - keys can now + // be specified out of order, and can be blanked or NULL to simulate removal - // Check that it's valid - if ( !strncmp( name, "key[", 4 ) ) - { - // Get the value of the property - char *value = mlt_properties_get_value( properties, i ); + // Structure to use for parsing and inserting + struct mlt_geometry_item_s item; - // Determine the frame number - int frame = atoi( name + 4 ); + // Parse the start property + item.frame = 0; + if ( mlt_geometry_parse_item( geometry, &item, mlt_properties_get( properties, "start" ) ) == 0 ) + mlt_geometry_insert( geometry, &item ); - // 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 ) + // 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 ) ) { - // Create a new geometry - struct geometry_s *temp = calloc( 1, sizeof( struct geometry_s ) ); - + // Get the value of the property + char *value = mlt_properties_get_value( properties, i ); + + // Determine the frame number + item.frame = atoi( name + 4 ); + // Parse and add to the list - geometry_parse( temp, ptr, value, normalised_width, normalised_height ); - - // Assign the position and frame - temp->frame = frame; - 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 ); + if ( mlt_geometry_parse_item( geometry, &item, value ) == 0 ) + mlt_geometry_insert( geometry, &item ); + else + fprintf( stderr, "Invalid Key - skipping %s = %s\n", name, value ); } } - } - - // 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; - return start; -} - -/** Parse the alignment properties into the geometry. -*/ - -static int alignment_parse( char* align ) -{ - int ret = 0; + // Parse the end + item.frame = -1; + if ( mlt_geometry_parse_item( geometry, &item, mlt_properties_get( properties, "end" ) ) == 0 ) + mlt_geometry_insert( geometry, &item ); + } - if ( align == NULL ); - else if ( isdigit( align[ 0 ] ) ) - ret = atoi( align ); - else if ( align[ 0 ] == 'c' || align[ 0 ] == 'm' ) - ret = 1; - else if ( align[ 0 ] == 'r' || align[ 0 ] == 'b' ) - ret = 2; - - return ret; + return geometry; } /** Adjust position according to scaled size and alignment properties. @@ -295,41 +166,37 @@ static int alignment_parse( char* align ) static void alignment_calculate( struct geometry_s *geometry ) { - geometry->x += ( geometry->w - geometry->sw ) * geometry->halign / 2; - geometry->y += ( geometry->h - geometry->sh ) * geometry->valign / 2; + geometry->item.x += ( geometry->item.w - geometry->sw ) * geometry->halign / 2; + geometry->item.y += ( geometry->item.h - geometry->sh ) * geometry->valign / 2; } /** Calculate the position for this frame. */ -static float position_calculate( mlt_transition this, mlt_position position ) +static int position_calculate( mlt_transition this, mlt_position position ) { // Get the in and out position mlt_position in = mlt_transition_get_in( this ); - mlt_position out = mlt_transition_get_out( this ); // Now do the calcs - return ( float )( position - in ) / ( float )( out - in + 1 ); + return position - in; } /** Calculate the field delta for this frame - position between two frames. */ -static inline float delta_calculate( mlt_transition this, mlt_frame frame ) +static inline double delta_calculate( mlt_transition this, mlt_frame frame, mlt_position position ) { // Get the in and out position mlt_position in = mlt_transition_get_in( this ); mlt_position out = mlt_transition_get_out( this ); - - // Get the position of the frame - char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" ); - mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), name ); + double length = out - in + 1; // Now do the calcs - float x = ( float )( position - in ) / ( float )( out - in + 1 ); - float y = ( float )( position + 1 - in ) / ( float )( out - in + 1 ); + double x = ( double )( position - in ) / length; + double y = ( double )( position + 1 - in ) / length; - return ( y - x ) / 2.0; + return length * ( y - x ) / 2.0; } static int get_value( mlt_properties properties, char *preferred, char *fallback ) @@ -503,42 +370,104 @@ static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int hei /** Composite a source line over a destination line */ -static inline -void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness ) +static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness ) +{ + register int j; + register int a; + register int mix; + + for ( j = 0; j < width; j ++ ) + { + a = *alpha_b ++; + mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness ); + mix = ( mix * a ) >> 8; + *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; + dest++; + *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; + dest++; + *alpha_a = mix | *alpha_a; + alpha_a ++; + } +} + +static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness ) +{ + register int j; + register int a; + register int mix; + + for ( j = 0; j < width; j ++ ) + { + a = *alpha_b ++ | *alpha_a; + mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness ); + mix = ( mix * a ) >> 8; + *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; + dest++; + *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; + dest++; + *alpha_a = mix | *alpha_a; + alpha_a ++; + } +} + +static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness ) +{ + register int j; + register int a; + register int mix; + + for ( j = 0; j < width; j ++ ) + { + a = *alpha_b ++ & *alpha_a; + mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness ); + mix = ( mix * a ) >> 8; + *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; + dest++; + *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; + dest++; + *alpha_a = mix | *alpha_a; + alpha_a ++; + } +} + +static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness ) { register int j; - int a, mix; + register int a; + register int mix; - for ( j = 0; j < width_src; j ++ ) + for ( j = 0; j < width; j ++ ) { - a = ( alpha == NULL ) ? 255 : *alpha ++; - mix = ( luma == NULL ) ? weight : linearstep( luma[ j ], luma[ j ] + softness, weight ); - mix = ( mix * ( a + 1 ) ) >> 8; + a = *alpha_b ++ ^ *alpha_a; + mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness ); + mix = ( mix * a ) >> 8; *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; dest++; *dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16; dest++; + *alpha_a = mix | *alpha_a; + alpha_a ++; } } /** Composite function. */ -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 field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn ) +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 *alpha_b, uint8_t *alpha_a, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn ) { int ret = 0; int i; int x_src = 0, y_src = 0; - int32_t weight = ( 1 << 16 ) * ( geometry.mix / 100 ); + int32_t weight = ( 1 << 16 ) * ( geometry.item.mix / 100 ); int step = ( field > -1 ) ? 2 : 1; int bpp = 2; int stride_src = width_src * bpp; int stride_dest = width_dest * bpp; // Adjust to consumer scale - int x = geometry.x * width_dest / geometry.nw; - int y = geometry.y * height_dest / geometry.nh; - int uneven = ( x & 1 ); + int x = rint( 0.5 + geometry.item.x * width_dest / geometry.nw ); + int y = rint( 0.5 + geometry.item.y * height_dest / geometry.nh ); + int x_uneven = x & 1; // optimization points - no work to do if ( width_src <= 0 || height_src <= 0 ) @@ -578,8 +507,8 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint p_dest += ( x < 0 ? 0 : x ) * bpp + ( y < 0 ? 0 : y ) * stride_dest; // offset pointer into alpha channel based upon cropping - if ( p_alpha ) - p_alpha += x_src + y_src * stride_src / bpp; + alpha_b += x_src + y_src * stride_src / bpp; + alpha_a += x + y * stride_dest / bpp; // offset pointer into luma channel based upon cropping if ( p_luma ) @@ -591,7 +520,6 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint // field 1 = upper field and y should be even. if ( ( field > -1 ) && ( y % 2 == field ) ) { - //fprintf( stderr, "field %d y %d\n", field, y ); if ( ( field == 1 && y < height_dest - 1 ) || ( field == 0 && y == 0 ) ) p_dest += stride_dest; else @@ -602,49 +530,35 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint if ( field == 1 ) { p_src += stride_src; - if ( p_alpha ) - p_alpha += stride_src / bpp; + alpha_b += stride_src / bpp; + alpha_a += stride_dest / bpp; height_src--; } stride_src *= step; stride_dest *= step; - int alpha_stride = stride_src / bpp; + int alpha_b_stride = stride_src / bpp; + int alpha_a_stride = stride_dest / bpp; - if ( uneven ) + // Make sure than x and w are even + if ( x_uneven ) { - p_dest += 2; + p_src += 2; width_src --; + alpha_a ++; } // now do the compositing only to cropped extents - if ( line_fn != NULL ) - { - for ( i = 0; i < height_src; i += step ) - { - line_fn( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness ); - - p_src += stride_src; - p_dest += stride_dest; - if ( p_alpha ) - p_alpha += alpha_stride; - if ( p_luma ) - p_luma += alpha_stride; - } - } - else + for ( i = 0; i < height_src; i += step ) { - for ( i = 0; i < height_src; i += step ) - { - composite_line_yuv( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness ); - - p_src += stride_src; - p_dest += stride_dest; - if ( p_alpha ) - p_alpha += alpha_stride; - if ( p_luma ) - p_luma += alpha_stride; - } + line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, weight, p_luma, softness ); + + p_src += stride_src; + p_dest += stride_dest; + alpha_b += alpha_b_stride; + alpha_a += alpha_a_stride; + if ( p_luma ) + p_luma += alpha_b_stride; } return ret; @@ -655,7 +569,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint */ static inline void -scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height ) +scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height, int invert ) { register int i, j; register int x_step = ( src_width << 16 ) / dest_width; @@ -669,7 +583,7 @@ scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t for ( j = 0; j < dest_width; j++ ) { - *dest_buf++ = src[ x >> 16 ]; + *dest_buf++ = src[ x >> 16 ] ^ invert; x += x_step; } y += y_step; @@ -682,10 +596,32 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height ) int luma_width = mlt_properties_get_int( properties, "_luma.width" ); int luma_height = mlt_properties_get_int( properties, "_luma.height" ); uint16_t *luma_bitmap = mlt_properties_get_data( properties, "_luma.bitmap", NULL ); + int invert = mlt_properties_get_int( properties, "luma_invert" ); // If the filename property changed, reload the map char *resource = mlt_properties_get( properties, "luma" ); + char temp[ 512 ]; + + if ( luma_width == 0 || luma_height == 0 ) + { + luma_width = width; + luma_height = height; + } + + if ( resource != NULL && strchr( resource, '%' ) ) + { + // TODO: Clean up quick and dirty compressed/existence check + FILE *test; + sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 ); + test = fopen( temp, "r" ); + if ( test == NULL ) + strcat( temp, ".png" ); + else + fclose( test ); + resource = temp; + } + if ( resource != NULL && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) ) { uint16_t *orig_bitmap = mlt_properties_get_data( properties, "_luma.orig_bitmap", NULL ); @@ -695,7 +631,7 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height ) // Load the original luma once if ( orig_bitmap == NULL ) { - char *extension = extension = strrchr( resource, '.' ); + char *extension = strrchr( resource, '.' ); // See if it is a PGM if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 ) @@ -767,7 +703,7 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height ) } // Scale luma map luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) ); - scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height ); + scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height, invert * ( ( 1 << 16 ) - 1 ) ); // Remember the scaled luma size to prevent unnecessary scaling mlt_properties_set_int( properties, "_luma.width", width ); @@ -789,15 +725,16 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); - if ( mlt_properties_get( properties, "distort" ) == NULL && mlt_properties_get( b_props, "distort" ) == NULL && geometry->distort == 0 ) + if ( mlt_properties_get_int( properties, "distort" ) == 0 && mlt_properties_get_int( b_props, "distort" ) == 0 && geometry->item.distort == 0 ) { // Adjust b_frame pixel aspect - int normalised_width = geometry->w; - int normalised_height = geometry->h; + int normalised_width = geometry->item.w; + int normalised_height = geometry->item.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" ); + if ( input_ar == 0.0 ) input_ar = output_ar; int scaled_width = input_ar / output_ar * real_width; int scaled_height = real_height; @@ -813,12 +750,20 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** scaled_height = normalised_height; } - // Now apply the fill - // TODO: Should combine fill/distort in one property - if ( mlt_properties_get( properties, "fill" ) != NULL ) + // Honour the fill request - this will scale the image to fill width or height while maintaining a/r + // ????: Shouln't this be the default behaviour? + if ( mlt_properties_get_int( properties, "fill" ) ) { - scaled_width = ( geometry->w / scaled_width ) * scaled_width; - scaled_height = ( geometry->h / scaled_height ) * scaled_height; + if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height < normalised_width ) + { + scaled_width = scaled_width * normalised_height / scaled_height; + scaled_height = normalised_height; + } + else if ( scaled_width < normalised_width && scaled_height * normalised_width / scaled_width < normalised_height ) + { + scaled_height = scaled_height * normalised_width / scaled_width; + scaled_width = normalised_width; + } } // Save the new scaled dimensions @@ -827,39 +772,28 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** } else { - geometry->sw = geometry->w; - geometry->sh = geometry->h; + geometry->sw = geometry->item.w; + geometry->sh = geometry->item.h; } // We want to ensure that we bypass resize now... - mlt_properties_set( b_props, "distort", "true" ); + mlt_properties_set_int( b_props, "distort", 1 ); // Take into consideration alignment for optimisation if ( !mlt_properties_get_int( properties, "titles" ) ) alignment_calculate( geometry ); // Adjust to consumer scale - 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; - //x = ( x | 1 ) ^ 1; - - // optimization points - no work to do - if ( *width < 1 || *height < 1 ) - 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 ); - return ret; + return ret && image != NULL; } -static struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transition this, mlt_frame a_frame, float position ) +static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, double position ) { // Get the properties from the transition mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); @@ -868,25 +802,38 @@ static struct geometry_s *composite_calculate( struct geometry_s *result, mlt_tr mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame ); // Structures for geometry - struct geometry_s *start = mlt_properties_get_data( properties, "geometries", NULL ); + mlt_geometry start = mlt_properties_get_data( properties, "geometries", 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" ); // Now parse the geometries - if ( start == NULL || mlt_properties_get_int( properties, "refresh" ) || start->nw != normalised_width || start->nh != normalised_height ) + if ( start == NULL ) { // Parse the transitions properties start = transition_parse_keys( this, normalised_width, normalised_height ); // Assign to properties to ensure we get destroyed - mlt_properties_set_data( properties, "geometries", start, 0, transition_destroy_keys, NULL ); - mlt_properties_set_int( properties, "refresh", 0 ); + mlt_properties_set_data( properties, "geometries", start, 0, ( mlt_destructor )mlt_geometry_close, NULL ); + } + else + { + int length = mlt_transition_get_out( this ) - mlt_transition_get_in( this ) + 1; + double cycle = mlt_properties_get_double( properties, "cycle" ); + if ( cycle > 1 ) + length = cycle; + else if ( cycle > 0 ) + length *= cycle; + mlt_geometry_refresh( start, mlt_properties_get( properties, "geometry" ), length, normalised_width, normalised_height ); } // Do the calculation - geometry_calculate( result, start, position ); + geometry_calculate( this, result, position ); + + // Assign normalised info + result->nw = normalised_width; + result->nh = normalised_height; // Now parse the alignment result->halign = alignment_parse( mlt_properties_get( properties, "halign" ) ); @@ -917,7 +864,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); // Get the position - float position = position_calculate( this, frame_position ); + int position = position_calculate( this, frame_position ); // Destination image uint8_t *dest = NULL; @@ -929,62 +876,87 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos // Pointers for copy operation uint8_t *p; - uint8_t *q; - uint8_t *r; - // Corrdinates + // Coordinates int w = 0; int h = 0; int x = 0; int y = 0; + int ss = 0; + int ds = 0; + // Will need to know region to copy struct geometry_s result; + double delta = delta_calculate( this, a_frame, frame_position ); + // Calculate the region now - composite_calculate( &result, this, a_frame, position ); + composite_calculate( this, &result, a_frame, position + delta / 2 ); // 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 = rint( 0.5 + result.item.x * width / result.nw ); + y = rint( 0.5 + result.item.y * height / result.nh ); + w = rint( 0.5 + result.item.w * width / result.nw ); + h = rint( 0.5 + result.item.h * height / result.nh ); - if ( y < 0 ) + // Make sure that x and w are even + if ( x & 1 ) { - h = h + y; - y = 0; + x --; + w += 2; + if ( w & 1 ) + w --; + } + else if ( w & 1 ) + { + w ++; } - if ( y + h > height ) - h = height - y; - - x = ( x | 1 ) ^ 1; - w = ( w | 1 ) ^ 1; + ds = w * 2; + ss = width * 2; // 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 ) - { - inline_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 ); + if ( y < 0 ) + { + dest += ( ds * -y ); + h += y; + y = 0; + } + + if ( y + h > height ) + h -= ( y + h - height ); + + if ( x < 0 ) + { + dest += -x * 2; + w += x; + x = 0; + } + + if ( w > 0 && h > 0 ) + { + // Copy the region of the image + p = image + y * ss + x * 2; + + while ( h -- ) + { + inline_memcpy( dest, p, w * 2 ); + dest += ds; + p += ss; + } + } + // Assign this position to the b frame mlt_frame_set_position( b_frame, frame_position ); - mlt_properties_set( b_props, "distort", "true" ); + mlt_properties_set_int( b_props, "distort", 1 ); // Return the frame return b_frame; @@ -1001,15 +973,26 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // 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 ); + // Get in and out + double position = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( a_frame ) ); + int out = mlt_frame_pop_service_int( a_frame ); + int in = mlt_frame_pop_service_int( a_frame ); // Get the properties from the transition mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + // TODO: clean up always_active behaviour + if ( mlt_properties_get_int( properties, "always_active" ) ) + { + mlt_events_block( properties, properties ); + mlt_properties_set_int( properties, "in", in ); + mlt_properties_set_int( properties, "out", out ); + mlt_events_unblock( properties, properties ); + } + + // This compositer is yuv422 only + *format = mlt_image_yuv422; + if ( b_frame != NULL ) { // Get the properties of the a frame @@ -1022,19 +1005,56 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f struct geometry_s result; // Calculate the position - float position = mlt_properties_get_double( b_props, "relative_position" ); - float delta = delta_calculate( this, a_frame ); - - // Do the calculation - struct geometry_s *start = composite_calculate( &result, this, a_frame, position ); + double delta = delta_calculate( this, a_frame, position ); // Get the image from the b frame uint8_t *image_b = NULL; int width_b = *width; int height_b = *height; + // Vars for alphas + uint8_t *alpha_a = NULL; + uint8_t *alpha_b = NULL; + + // Composites always need scaling... defaulting to lowest + char *rescale = mlt_properties_get( a_props, "rescale.interp" ); + if ( rescale == NULL || !strcmp( rescale, "none" ) ) + rescale = "nearest"; + mlt_properties_set( a_props, "rescale.interp", rescale ); + mlt_properties_set( b_props, "rescale.interp", rescale ); + + // Do the calculation + composite_calculate( this, &result, 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_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) ); + mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) ); + mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) ); + + // TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing + if ( mlt_properties_get_int( properties, "no_alpha" ) && + result.item.x == 0 && result.item.y == 0 && result.item.w == *width && result.item.h == *height && result.item.mix == 100 ) + { + mlt_frame_get_image( b_frame, image, format, width, height, 1 ); + if ( !mlt_frame_is_test_card( a_frame ) ) + mlt_frame_replace_image( a_frame, *image, *format, *width, *height ); + return 0; + } + + if ( a_frame == b_frame ) + { + get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ); + alpha_b = mlt_frame_get_alpha_mask( b_frame ); + } + + // Get the image from the a frame + mlt_frame_get_image( a_frame, image, format, width, height, 1 ); + alpha_a = mlt_frame_get_alpha_mask( a_frame ); + // Optimisation - no compositing required - if ( result.mix == 0 || ( result.w == 0 && result.h == 0 ) ) + if ( result.item.mix == 0 || ( result.item.w == 0 && result.item.h == 0 ) ) return 0; // Need to keep the width/height of the a_frame on the b_frame for titling @@ -1051,28 +1071,19 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f mlt_properties_set_int( b_props, "dest_height", mlt_properties_get_int( a_props, "dest_height" ) ); } - // 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_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) ); - mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); - mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) ); - mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) ); - // Special case for titling... if ( mlt_properties_get_int( properties, "titles" ) ) { if ( mlt_properties_get( b_props, "rescale.interp" ) == NULL ) mlt_properties_set( b_props, "rescale.interp", "hyper" ); - mlt_properties_set( properties, "fill", NULL ); width_b = mlt_properties_get_int( a_props, "dest_width" ); height_b = mlt_properties_get_int( a_props, "dest_height" ); } - if ( get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 ) + if ( image_b != NULL || get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 ) { uint8_t *dest = *image; uint8_t *src = image_b; - uint8_t *alpha = mlt_frame_get_alpha_mask( b_frame ); int progressive = mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "progressive" ); @@ -1080,21 +1091,38 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f int32_t luma_softness = mlt_properties_get_double( properties, "softness" ) * ( 1 << 16 ); uint16_t *luma_bitmap = get_luma( properties, width_b, height_b ); - //composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL; - composite_line_fn line_fn = NULL; + + alpha_b = alpha_b == NULL ? mlt_frame_get_alpha_mask( b_frame ) : alpha_b; + + composite_line_fn line_fn = composite_line_yuv; + + if ( mlt_properties_get_int( properties, "or" ) ) + line_fn = composite_line_yuv_or; + if ( mlt_properties_get_int( properties, "and" ) ) + line_fn = composite_line_yuv_and; + if ( mlt_properties_get_int( properties, "xor" ) ) + line_fn = composite_line_yuv_xor; + + if ( mlt_properties_get( properties, "alpha_a" ) ) + memset( alpha_a, mlt_properties_get_int( properties, "alpha_a" ), *width * *height ); + + if ( mlt_properties_get( properties, "alpha_b" ) ) + memset( alpha_b, mlt_properties_get_int( properties, "alpha_b" ), width_b * height_b ); for ( field = 0; field < ( progressive ? 1 : 2 ); field++ ) { // Assume lower field (0) first - float field_position = position + field * delta; + double field_position = position + field * delta; // Do the calculation if we need to - geometry_calculate( &result, start, field_position ); + composite_calculate( this, &result, a_frame, field_position ); if ( mlt_properties_get_int( properties, "titles" ) ) { - result.nw = result.w = *width; - result.nh = result.h = *height; + result.item.w = *width * ( result.item.w / result.nw ); + result.nw = result.item.w; + result.item.h = *height * ( result.item.h / result.nh ); + result.nh = *height; result.sw = width_b; result.sh = height_b; } @@ -1103,10 +1131,14 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f alignment_calculate( &result ); // Composite the b_frame on the a_frame - composite_yuv( dest, *width, *height, src, width_b, height_b, alpha, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn ); + composite_yuv( dest, *width, *height, src, width_b, height_b, alpha_b, alpha_a, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn ); } } } + else + { + mlt_frame_get_image( a_frame, image, format, width, height, 1 ); + } return 0; } @@ -1116,14 +1148,20 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame ) { - // Get a unique name to store the frame position - char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" ); - - // Assign the current position to the name - mlt_properties_set_position( MLT_FRAME_PROPERTIES( a_frame ), name, mlt_frame_get_position( a_frame ) ); - - // Propogate the transition properties to the b frame - mlt_properties_set_double( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", position_calculate( this, mlt_frame_get_position( a_frame ) ) ); + // UGH - this is a TODO - find a more reliable means of obtaining in/out for the always_active case + if ( mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "always_active" ) == 0 ) + { + mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "in" ) ); + mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "out" ) ); + mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), position_calculate( this, mlt_frame_get_position( a_frame ) ) ); + } + else + { + mlt_properties props = mlt_properties_get_data( MLT_FRAME_PROPERTIES( b_frame ), "_producer", NULL ); + mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "in" ) ); + mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "out" ) ); + mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), mlt_properties_get_int( props, "_frame" ) - mlt_properties_get_int( props, "in" ) ); + } mlt_frame_push_service( a_frame, this ); mlt_frame_push_frame( a_frame, b_frame ); @@ -1144,11 +1182,14 @@ mlt_transition transition_composite_init( char *arg ) this->process = composite_process; // Default starting motion and zoom - mlt_properties_set( properties, "start", arg != NULL ? arg : "85%,5%:10%x10%" ); + mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" ); // Default factory mlt_properties_set( properties, "factory", "fezzik" ); + // Inform apps and framework that this is a video only transition + mlt_properties_set_int( properties, "_transition_type", 1 ); + #ifdef USE_MMX //mlt_properties_set_int( properties, "_MMX", composite_have_mmx() ); #endif