X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=57cf67d01976aabb16fc32c3674816a932e7feb8;hb=95f429b56026f5897ebad9060608b6631dcf7515;hp=1af94dff5aa6629c5fef0337233a99c2bef1d448;hpb=3544a004b42ec88fa0d1ef95733b875d7071ffcf;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 1af94df..57cf67d 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -40,6 +40,7 @@ typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, struct geometry_s { + int frame; float position; float mix; int nw; // normalised width @@ -154,23 +155,31 @@ static void geometry_calculate( struct geometry_s *output, struct geometry_s *in 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; - 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; - output->distort = in->distort; - - // DRD> These break on negative values. I do not think they are needed - // since yuv_composite takes care of YUYV group alignment - //output->x = ( int )floor( output->x ) & 0xfffffffe; - //output->w = ( int )floor( output->w ) & 0xfffffffe; - //output->sw &= 0xfffffffe; + 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 + { + 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; + } } -void transition_destroy_keys( void *arg ) +static void transition_destroy_keys( void *arg ) { struct geometry_s *ptr = arg; struct geometry_s *next = NULL; @@ -239,7 +248,8 @@ static struct geometry_s *transition_parse_keys( mlt_transition this, int norma // Parse and add to the list geometry_parse( temp, ptr, value, normalised_width, normalised_height ); - // Assign the position + // Assign the position and frame + temp->frame = frame; temp->position = position; // Allow the next to be appended after this one @@ -259,9 +269,6 @@ static struct geometry_s *transition_parse_keys( mlt_transition this, int norma 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; } @@ -531,10 +538,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint // Adjust to consumer scale int x = geometry.x * width_dest / geometry.nw; int y = geometry.y * height_dest / geometry.nh; - - // Align x to a full YUYV group - x &= 0xfffffffe; - width_src &= 0xfffffffe; + int uneven = ( x & 1 ); // optimization points - no work to do if ( width_src <= 0 || height_src <= 0 ) @@ -560,6 +564,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint { y_src = -y; height_src -= y_src; + y = 0; } // crop overlay below bottom edge of frame @@ -606,20 +611,37 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint stride_dest *= step; int alpha_stride = stride_src / bpp; - if ( line_fn == NULL ) - line_fn = composite_line_yuv; + if ( uneven ) + p_src -= 2; // now do the compositing only to cropped extents - for ( i = 0; i < height_src; i += step ) + if ( line_fn != NULL ) { - 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; + 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 ) + { + 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; + } } return ret; @@ -818,7 +840,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** *width = geometry->sw * *width / geometry->nw; *height = geometry->sh * *height / geometry->nh; - x &= 0xfffffffe; + //x = ( x | 1 ) ^ 1; // optimization points - no work to do if ( *width < 1 || *height < 1 ) @@ -833,7 +855,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** } -struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transition this, mlt_frame a_frame, float position ) +static 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 ); @@ -845,7 +867,7 @@ struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transitio struct geometry_s *start = mlt_properties_get_data( properties, "geometries", NULL ); // Now parse the geometries - if ( start == NULL ) + if ( start == NULL || mlt_properties_get_int( properties, "refresh" ) ) { // Obtain the normalised width and height from the a_frame int normalised_width = mlt_properties_get_int( a_props, "normalised_width" ); @@ -853,6 +875,10 @@ struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transitio // 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 ); } // Do the calculation @@ -865,6 +891,16 @@ struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transitio return start; } +static inline void inline_memcpy( uint8_t *dest, uint8_t *src, int length ) +{ + uint8_t *end = src + length; + while ( src < end ) + { + *dest ++ = *src ++; + *dest ++ = *src ++; + } +} + mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_position frame_position ) { // Create a frame to return @@ -910,8 +946,17 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos w = result.w * width / result.nw; h = result.h * height / result.nh; - x &= 0xfffffffe; - //w &= 0xfffffffe; + if ( y < 0 ) + { + h = h + y; + y = 0; + } + + if ( y + h > height ) + h = height - y; + + x = ( x | 1 ) ^ 1; + w = ( w | 1 ) ^ 1; // Now we need to create a new destination image dest = mlt_pool_alloc( w * h * 2 ); @@ -923,7 +968,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos while ( q < r ) { - memcpy( q, p, w * 2 ); + inline_memcpy( q, p, w * 2 ); q += w * 2; p += width * 2; } @@ -957,6 +1002,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Get the image from the a frame mlt_frame_get_image( a_frame, image, format, width, height, 1 ); + // Get the properties from the transition + mlt_properties properties = mlt_transition_properties( this ); + if ( b_frame != NULL ) { // Get the properties of the a frame @@ -965,9 +1013,6 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Get the properties of the b frame mlt_properties b_props = mlt_frame_properties( b_frame ); - // Get the properties from the transition - mlt_properties properties = mlt_transition_properties( this ); - // Structures for geometry struct geometry_s result; @@ -977,20 +1022,45 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Do the calculation struct geometry_s *start = composite_calculate( &result, this, a_frame, position ); - + + // Get the image from the b frame + uint8_t *image_b = NULL; + int width_b = *width; + int height_b = *height; + // Optimisation - no compositing required if ( result.mix == 0 || ( result.w == 0 && result.h == 0 ) ) return 0; + // Need to keep the width/height of the a_frame on the b_frame for titling + if ( mlt_properties_get( a_props, "dest_width" ) == NULL ) + { + mlt_properties_set_int( a_props, "dest_width", *width ); + mlt_properties_set_int( a_props, "dest_height", *height ); + mlt_properties_set_int( b_props, "dest_width", *width ); + mlt_properties_set_int( b_props, "dest_height", *height ); + } + else + { + mlt_properties_set_int( b_props, "dest_width", mlt_properties_get_int( a_props, "dest_width" ) ); + 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_progressive", mlt_properties_get_double( a_props, "consumer_progressive" ) ); mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); - // Get the image from the b frame - uint8_t *image_b = NULL; - int width_b = *width; - int height_b = *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", "nearest" ); + 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 ) { uint8_t *dest = *image; @@ -1003,7 +1073,8 @@ 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 : composite_line_yuv; + //composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL; + composite_line_fn line_fn = NULL; for ( field = 0; field < ( progressive ? 1 : 2 ); field++ ) {