X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=5a0db4ddb0d544b94c4bddaefbc5d9bea9d3ba06;hb=cc7993dc7fdb45803bbd689573b623aa554929ec;hp=48d1c6ef0bda1a3b4d97507c88e69a6e55fbb190;hpb=3f7c53230945e427b019ba5df4fec587e19e29c1;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 48d1c6e..5a0db4d 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,14 +155,28 @@ 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; + if ( in->frame != out->frame - 1 ) + { + 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; + } + 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; + } // DRD> These break on negative values. I do not think they are needed // since yuv_composite takes care of YUYV group alignment @@ -239,7 +254,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 +275,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; } @@ -315,7 +328,8 @@ static inline float delta_calculate( mlt_transition this, mlt_frame frame ) mlt_position out = mlt_transition_get_out( this ); // Get the position of the frame - mlt_position position = mlt_frame_get_position( frame ); + char *name = mlt_properties_get( mlt_transition_properties( this ), "_unique_id" ); + mlt_position position = mlt_properties_get_position( mlt_frame_properties( frame ), name ); // Now do the calcs float x = ( float )( position - in ) / ( float )( out - in + 1 ); @@ -524,10 +538,9 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint int32_t weight = ( 1 << 16 ) * ( geometry.mix / 100 ); int step = ( field > -1 ) ? 2 : 1; int bpp = 2; - int stride_src = width_src * bpp * step; - int stride_dest = width_dest * bpp * step; - int alpha_stride = stride_src / bpp; - + 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; @@ -552,7 +565,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint } // crop overlay beyond right edge of frame - else if ( x + width_src > width_dest ) + if ( x + width_src > width_dest ) width_src = width_dest - x; // crop overlay off the top edge of the frame @@ -561,8 +574,9 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint y_src = -y; height_src -= y_src; } + // crop overlay below bottom edge of frame - else if ( y + height_src > height_dest ) + if ( y + height_src > height_dest ) height_src = height_dest - y; // offset pointer into overlay buffer based on cropping @@ -601,20 +615,38 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint height_src--; } - if ( line_fn == NULL ) - line_fn = composite_line_yuv; + stride_src *= step; + stride_dest *= step; + int alpha_stride = stride_src / bpp; // 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; @@ -813,7 +845,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 -= x % 2; + x &= 0xfffffffe; // optimization points - no work to do if ( *width < 1 || *height < 1 ) @@ -828,7 +860,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 ); @@ -840,7 +872,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" ); @@ -848,6 +880,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 @@ -906,7 +942,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos h = result.h * height / result.nh; x &= 0xfffffffe; - //w &= 0xfffffffe; + w &= 0xfffffffe; // Now we need to create a new destination image dest = mlt_pool_alloc( w * h * 2 ); @@ -952,6 +988,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 @@ -960,9 +999,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; @@ -991,14 +1027,15 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f 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, "progressive" ) || + int progressive = mlt_properties_get_int( a_props, "consumer_progressive" ) || mlt_properties_get_int( properties, "progressive" ); int field; 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++ ) { @@ -1025,8 +1062,15 @@ 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 ) ) ); + mlt_frame_push_service( a_frame, this ); mlt_frame_push_frame( a_frame, b_frame ); mlt_frame_push_get_image( a_frame, transition_get_image );