X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=9b9eada2d55c224e29650e13f37b2a640f47706d;hb=facc6328e46eb0c973c6293390a14258abf071d4;hp=14e00575519a52f53c2bdc6c9c8ba34bae5088b1;hpb=b698c58e57643e9df6941d91b07a40c997bd7e64;p=mlt diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 14e00575..9b9eada2 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -66,9 +66,9 @@ static int alignment_parse( char* align ) /** Calculate real geometry. */ -static void geometry_calculate( mlt_transition this, struct geometry_s *output, double position ) +static void geometry_calculate( mlt_transition self, struct geometry_s *output, double position ) { - mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( self ); 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" ); @@ -87,21 +87,19 @@ static void geometry_calculate( mlt_transition this, struct geometry_s *output, mlt_geometry_fetch( geometry, &output->item, position ); } -static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_width, int normalised_height ) +static mlt_geometry transition_parse_keys( mlt_transition self, 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 ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( self ); // 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; + // Get the duration + mlt_position length = mlt_transition_get_length( self ); double cycle = mlt_properties_get_double( properties, "cycle" ); // Get the new style geometry string @@ -158,6 +156,7 @@ static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_w item.frame = -1; if ( mlt_geometry_parse_item( geometry, &item, mlt_properties_get( properties, "end" ) ) == 0 ) mlt_geometry_insert( geometry, &item ); + mlt_geometry_interpolate( geometry ); } return geometry; @@ -175,10 +174,10 @@ static void alignment_calculate( struct geometry_s *geometry ) /** Calculate the position for this frame. */ -static int position_calculate( mlt_transition this, mlt_position position ) +static int position_calculate( mlt_transition self, mlt_position position ) { // Get the in and out position - mlt_position in = mlt_transition_get_in( this ); + mlt_position in = mlt_transition_get_in( self ); // Now do the calcs return position - in; @@ -187,20 +186,6 @@ static int position_calculate( mlt_transition this, mlt_position position ) /** Calculate the field delta for this frame - position between two frames. */ -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 ); - double length = out - in + 1; - - // Now do the calcs - double x = ( double )( position - in ) / length; - double y = ( double )( position + 1 - in ) / length; - - return length * ( y - x ) / 2.0; -} - static int get_value( mlt_properties properties, const char *preferred, const char *fallback ) { int value = mlt_properties_get_int( properties, preferred ); @@ -370,7 +355,7 @@ static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int hei static inline int calculate_mix( uint16_t *luma, int j, int softness, int weight, int alpha, uint32_t step ) { - return ( ( luma ? smoothstep( luma[ j ], luma[ j ] + softness, step ) : weight ) * alpha ) >> 8; + return ( ( luma ? smoothstep( luma[ j ], luma[ j ] + softness, step ) : weight ) * ( alpha + 1 ) ) >> 8; } static inline uint8_t sample_mix( uint8_t dest, uint8_t src, int mix ) @@ -380,13 +365,28 @@ static inline uint8_t sample_mix( uint8_t dest, uint8_t src, int mix ) /** Composite a source line over a destination line */ +#if defined(USE_SSE) && defined(ARCH_X86_64) +void composite_line_yuv_sse2_simple(uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight); +#endif -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 soft, uint32_t step ) +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 soft, uint32_t step ) { - register int j; + register int j = 0; register int mix; - for ( j = 0; j < width; j ++ ) +#if defined(USE_SSE) && defined(ARCH_X86_64) + if ( !luma && width > 7 ) + { + composite_line_yuv_sse2_simple(dest, src, width, alpha_b, alpha_a, weight); + j = width - width % 8; + dest += j * 2; + src += j * 2; + alpha_a += j; + alpha_b += j; + } +#endif + + for ( ; j < width; j ++ ) { mix = calculate_mix( luma, j, soft, weight, *alpha_b ++, step ); *dest = sample_mix( *dest, *src++, mix ); @@ -460,8 +460,8 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint int stride_src = geometry.sw * bpp; int stride_dest = width_dest * bpp; int i_softness = ( 1 << 16 ) * softness; - int weight = ( ( 1 << 16 ) - 1 ) * geometry.item.mix / 100; - uint32_t luma_step = ( ( 1 << 16 ) - 1 ) * geometry.item.mix / 100 * ( 1.0 + softness ); + int weight = ( ( 1 << 16 ) * geometry.item.mix + 50 ) / 100; + uint32_t luma_step = ( ( ( 1 << 16 ) - 1 ) * geometry.item.mix + 50 ) / 100 * ( 1.0 + softness ); // Adjust to consumer scale int x = rint( geometry.item.x * width_dest / geometry.nw ); @@ -521,7 +521,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint p_src += x_src * bpp + y_src * stride_src; // offset pointer into frame buffer based upon positive coordinates only! - p_dest += ( x < 0 ? 0 : x ) * bpp + ( y < 0 ? 0 : y ) * stride_dest; + p_dest += x * bpp + y * stride_dest; // offset pointer into alpha channel based upon cropping alpha_b += x_src + y_src * stride_src / bpp; @@ -561,7 +561,6 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint if ( uneven_x != uneven_x_src ) { p_src += 2; - width_src -= 2; alpha_b += 1; } @@ -607,7 +606,7 @@ scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t } } -static uint16_t* get_luma( mlt_transition this, mlt_properties properties, int width, int height ) +static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int width, int height ) { // The cached luma map information int luma_width = mlt_properties_get_int( properties, "_luma.width" ); @@ -675,7 +674,7 @@ static uint16_t* get_luma( mlt_transition this, mlt_properties properties, int w if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 ) { // Open PGM - FILE *f = fopen( resource, "r" ); + FILE *f = fopen( resource, "rb" ); if ( f != NULL ) { // Load from PGM @@ -694,7 +693,7 @@ static uint16_t* get_luma( mlt_transition this, mlt_properties properties, int w char *factory = mlt_properties_get( properties, "factory" ); // Create the producer - mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) ); + mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( self ) ); mlt_producer producer = mlt_factory_producer( profile, factory, resource ); // If we have one @@ -757,26 +756,24 @@ static uint16_t* get_luma( mlt_transition this, mlt_properties properties, int w /** Get the properly sized image from b_frame. */ -static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **image, int *width, int *height, struct geometry_s *geometry ) +static int get_b_frame_image( mlt_transition self, 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; // Get the properties objects mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); - mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( self ); uint8_t resize_alpha = mlt_properties_get_int( b_props, "resize_alpha" ); + double output_ar = mlt_profile_sar( mlt_service_profile( MLT_TRANSITION_SERVICE(self) ) ); // Do not scale if we are cropping - the compositing rectangle can crop the b image // TODO: Use the animatable w and h of the crop geometry to scale independently of crop rectangle if ( mlt_properties_get( properties, "crop" ) ) { - int real_width = get_value( b_props, "real_width", "width" ); - int real_height = get_value( b_props, "real_height", "height" ); + int real_width = get_value( b_props, "meta.media.width", "width" ); + int real_height = get_value( b_props, "meta.media.height", "height" ); double input_ar = mlt_properties_get_double( b_props, "aspect_ratio" ); - double consumer_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" ); - double background_ar = mlt_properties_get_double( b_props, "output_ratio" ); - double output_ar = background_ar != 0.0 ? background_ar : consumer_ar; int scaled_width = rint( ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width ); int scaled_height = real_height; geometry->sw = scaled_width; @@ -788,17 +785,14 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** // Adjust b_frame pixel aspect 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" ); + int real_width = get_value( b_props, "meta.media.width", "width" ); + int real_height = get_value( b_props, "meta.media.height", "height" ); double input_ar = mlt_properties_get_double( b_props, "aspect_ratio" ); - double consumer_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" ); - double background_ar = mlt_properties_get_double( b_props, "output_ratio" ); - double output_ar = background_ar != 0.0 ? background_ar : consumer_ar; int scaled_width = rint( ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width ); int scaled_height = real_height; -// fprintf(stderr, "%s: scaled %dx%d norm %dx%d real %dx%d output_ar %f => %f\n", __FILE__, +// fprintf(stderr, "%s: scaled %dx%d norm %dx%d real %dx%d output_ar %f\n", __FILE__, // scaled_width, scaled_height, normalised_width, normalised_height, real_width, real_height, -// background_ar, output_ar); +// output_ar); // Now ensure that our images fit in the normalised frame if ( scaled_width > normalised_width ) @@ -853,6 +847,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** // Adjust to consumer scale *width = rint( geometry->sw * *width / geometry->nw ); + *width -= *width % 2; // coerce to even width for yuv422 *height = rint( geometry->sh * *height / geometry->nh ); // fprintf(stderr, "%s: scaled %dx%d norm %dx%d resize %dx%d\n", __FILE__, // geometry->sw, geometry->sh, geometry->nw, geometry->nh, *width, *height); @@ -870,7 +865,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** return ret && image != NULL; } -static void crop_calculate( mlt_transition this, mlt_properties properties, struct geometry_s *result, double position ) +static void crop_calculate( mlt_transition self, mlt_properties properties, struct geometry_s *result, double position ) { // Initialize panning info result->x_src = 0; @@ -881,9 +876,7 @@ static void crop_calculate( mlt_transition this, mlt_properties properties, stru if ( !crop ) { crop = mlt_geometry_init(); - mlt_position in = mlt_transition_get_in( this ); - mlt_position out = mlt_transition_get_out( this ); - int length = out - in + 1; + mlt_position length = mlt_transition_get_length( self ); double cycle = mlt_properties_get_double( properties, "cycle" ); // Allow a geometry repeat cycle @@ -915,10 +908,10 @@ static void crop_calculate( mlt_transition this, mlt_properties properties, stru } } -static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, double position ) +static mlt_geometry composite_calculate( mlt_transition self, struct geometry_s *result, mlt_frame a_frame, double position ) { // Get the properties from the transition - mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( self ); // Get the properties from the frame mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame ); @@ -927,8 +920,9 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s 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" ); + mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( self ) ); + int normalised_width = profile->width; + int normalised_height = profile->height; char *name = mlt_properties_get( properties, "_unique_id" ); char key[ 256 ]; @@ -936,7 +930,7 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s sprintf( key, "%s.in", name ); if ( mlt_properties_get( a_props, key ) ) { - sscanf( mlt_properties_get( a_props, key ), "%f,%f,%f,%f,%f,%d,%d", &result->item.x, &result->item.y, &result->item.w, &result->item.h, &result->item.mix, &result->nw, &result->nh ); + sscanf( mlt_properties_get( a_props, key ), "%f %f %f %f %f %d %d", &result->item.x, &result->item.y, &result->item.w, &result->item.h, &result->item.mix, &result->nw, &result->nh ); } else { @@ -944,14 +938,14 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s if ( start == NULL ) { // Parse the transitions properties - start = transition_parse_keys( this, normalised_width, normalised_height ); + start = transition_parse_keys( self, normalised_width, normalised_height ); // Assign to properties to ensure we get destroyed 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; + mlt_position length = mlt_transition_get_length( self ); double cycle = mlt_properties_get_double( properties, "cycle" ); if ( cycle > 1 ) length = cycle; @@ -961,7 +955,7 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s } // Do the calculation - geometry_calculate( this, result, position ); + geometry_calculate( self, result, position ); // Assign normalised info result->nw = normalised_width; @@ -972,15 +966,15 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s result->halign = alignment_parse( mlt_properties_get( properties, "halign" ) ); result->valign = alignment_parse( mlt_properties_get( properties, "valign" ) ); - crop_calculate( this, properties, result, position ); + crop_calculate( self, properties, result, position ); return start; } -mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_position frame_position ) +mlt_frame composite_copy_region( mlt_transition self, mlt_frame a_frame, mlt_position frame_position ) { // Create a frame to return - mlt_frame b_frame = mlt_frame_init( MLT_TRANSITION_SERVICE( this ) ); + mlt_frame b_frame = mlt_frame_init( MLT_TRANSITION_SERVICE( self ) ); // Get the properties of the a frame mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame ); @@ -989,20 +983,24 @@ 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 - int position = position_calculate( this, frame_position ); + int position = position_calculate( self, frame_position ); // Get the unique id of the transition - char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" ); + char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( self ), "_unique_id" ); char key[ 256 ]; // Destination image uint8_t *dest = NULL; // Get the image and dimensions - uint8_t *image = mlt_properties_get_data( a_props, "image", NULL ); + uint8_t *image = NULL; int width = mlt_properties_get_int( a_props, "width" ); int height = mlt_properties_get_int( a_props, "height" ); - int format = mlt_properties_get_int( a_props, "format" ); + mlt_image_format format = mlt_image_yuv422; + + mlt_frame_get_image( a_frame, &image, &format, &width, &height, 0 ); + if ( !image ) + return b_frame; // Pointers for copy operation uint8_t *p; @@ -1020,7 +1018,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos struct geometry_s result; // Calculate the region now - composite_calculate( this, &result, a_frame, position ); + composite_calculate( self, &result, a_frame, position ); // Need to scale down to actual dimensions x = rint( result.item.x * width / result.nw ); @@ -1035,9 +1033,9 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos } // Store the key - sprintf( key, "%s.in=%d,%d,%d,%d,%f,%d,%d", name, x, y, w, h, result.item.mix, width, height ); + sprintf( key, "%s.in=%d %d %d %d %f %d %d", name, x, y, w, h, result.item.mix, width, height ); mlt_properties_parse( a_props, key ); - sprintf( key, "%s.out=%d,%d,%d,%d,%f,%d,%d", name, x, y, w, h, result.item.mix, width, height ); + sprintf( key, "%s.out=%d %d %d %d %f %d %d", name, x, y, w, h, result.item.mix, width, height ); mlt_properties_parse( a_props, key ); ds = w * 2; @@ -1047,7 +1045,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos dest = mlt_pool_alloc( w * h * 2 ); // Assign to the new frame - mlt_properties_set_data( b_props, "image", dest, w * h * 2, mlt_pool_release, NULL ); + mlt_frame_set_image( b_frame, dest, w * h * 2, mlt_pool_release ); mlt_properties_set_int( b_props, "width", w ); mlt_properties_set_int( b_props, "height", h ); mlt_properties_set_int( b_props, "format", format ); @@ -1099,7 +1097,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f mlt_frame b_frame = mlt_frame_pop_frame( a_frame ); // Get the transition from the a frame - mlt_transition this = mlt_frame_pop_service( a_frame ); + mlt_transition self = mlt_frame_pop_service( a_frame ); // Get in and out double position = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( a_frame ) ); @@ -1107,7 +1105,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f int in = mlt_frame_pop_service_int( a_frame ); // Get the properties from the transition - mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( self ); // TODO: clean up always_active behaviour if ( mlt_properties_get_int( properties, "always_active" ) ) @@ -1133,36 +1131,32 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f struct geometry_s result; // Calculate the position - double delta = delta_calculate( this, a_frame, position ); + double delta = mlt_transition_get_progress_delta( self, a_frame ); + mlt_position length = mlt_transition_get_length( self ); // Get the image from the b frame uint8_t *image_b = NULL; - int width_b = *width; - int height_b = *height; + mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( self ) ); + int width_b = *width > 0 ? *width : profile->width; + int height_b = *height > 0 ? *height : profile->height; // Vars for alphas uint8_t *alpha_a = NULL; uint8_t *alpha_b = NULL; - // Composites always need scaling... defaulting to lowest - const 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 // NB: Locks needed here since the properties are being modified int invert = mlt_properties_get_int( properties, "invert" ); - mlt_service_lock( MLT_TRANSITION_SERVICE( this ) ); - composite_calculate( this, &result, invert ? b_frame : a_frame, position ); - mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) ); + mlt_service_lock( MLT_TRANSITION_SERVICE( self ) ); + composite_calculate( self, &result, invert ? b_frame : a_frame, position ); + mlt_service_unlock( MLT_TRANSITION_SERVICE( self ) ); - // Since we are the consumer of the b_frame, we must pass along these - // consumer properties from the a_frame - mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) ); - mlt_properties_set( b_props, "consumer_deinterlace_method", mlt_properties_get( a_props, "consumer_deinterlace_method" ) ); - mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + // Manual option to deinterlace + if ( mlt_properties_get_int( properties, "deinterlace" ) ) + { + mlt_properties_set_int( a_props, "consumer_deinterlace", 1 ); + mlt_properties_set_int( b_props, "consumer_deinterlace", 1 ); + } // TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing if ( mlt_properties_get_int( properties, "no_alpha" ) && @@ -1177,7 +1171,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f if ( a_frame == b_frame ) { double aspect_ratio = mlt_frame_get_aspect_ratio( b_frame ); - get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ); + get_b_frame_image( self, b_frame, &image_b, &width_b, &height_b, &result ); alpha_b = mlt_frame_get_alpha_mask( b_frame ); mlt_properties_set_double( a_props, "aspect_ratio", aspect_ratio ); } @@ -1213,7 +1207,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f height_b = mlt_properties_get_int( a_props, "dest_height" ); } - if ( *image != image_b && ( ( invert ? 0 : image_b ) || get_b_frame_image( this, b_frame, invert ? image : &image_b, &width_b, &height_b, &result ) == 0 ) ) + if ( *image != image_b && ( ( invert ? 0 : image_b ) || get_b_frame_image( self, b_frame, invert ? image : &image_b, &width_b, &height_b, &result ) == 0 ) ) { uint8_t *dest = *image; uint8_t *src = image_b; @@ -1223,9 +1217,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f int field; double luma_softness = mlt_properties_get_double( properties, "softness" ); - mlt_service_lock( MLT_TRANSITION_SERVICE( this ) ); - uint16_t *luma_bitmap = get_luma( this, properties, width_b, height_b ); - mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) ); + mlt_service_lock( MLT_TRANSITION_SERVICE( self ) ); + uint16_t *luma_bitmap = get_luma( self, properties, width_b, height_b ); + mlt_service_unlock( MLT_TRANSITION_SERVICE( self ) ); char *operator = mlt_properties_get( properties, "operator" ); alpha_b = alpha_b == NULL ? mlt_frame_get_alpha_mask( b_frame ) : alpha_b; @@ -1253,13 +1247,13 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f for ( field = 0; field < ( progressive ? 1 : 2 ); field++ ) { // Assume lower field (0) first - double field_position = position + field * delta; + double field_position = position + field * delta * length; // Do the calculation if we need to // NB: Locks needed here since the properties are being modified - mlt_service_lock( MLT_TRANSITION_SERVICE( this ) ); - composite_calculate( this, &result, invert ? b_frame : a_frame, field_position ); - mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) ); + mlt_service_lock( MLT_TRANSITION_SERVICE( self ) ); + composite_calculate( self, &result, invert ? b_frame : a_frame, field_position ); + mlt_service_unlock( MLT_TRANSITION_SERVICE( self ) ); if ( mlt_properties_get_int( properties, "titles" ) ) { @@ -1304,14 +1298,14 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f /** Composition transition processing. */ -static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame ) +static mlt_frame composite_process( mlt_transition self, mlt_frame a_frame, mlt_frame b_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 ) + if ( mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "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 ) ) ); + mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "in" ) ); + mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "out" ) ); + mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), position_calculate( self, mlt_frame_get_position( a_frame ) ) ); } else { @@ -1321,7 +1315,7 @@ static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_ 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_service( a_frame, self ); mlt_frame_push_frame( a_frame, b_frame ); mlt_frame_push_get_image( a_frame, transition_get_image ); return a_frame; @@ -1332,15 +1326,15 @@ static mlt_frame composite_process( mlt_transition this, mlt_frame a_frame, mlt_ mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { - mlt_transition this = calloc( sizeof( struct mlt_transition_s ), 1 ); - if ( this != NULL && mlt_transition_init( this, NULL ) == 0 ) + mlt_transition self = calloc( 1, sizeof( struct mlt_transition_s ) ); + if ( self != NULL && mlt_transition_init( self, NULL ) == 0 ) { - mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); + mlt_properties properties = MLT_TRANSITION_PROPERTIES( self ); - this->process = composite_process; + self->process = composite_process; // Default starting motion and zoom - mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" ); + mlt_properties_set( properties, "start", arg != NULL ? arg : "0/0:100%x100%" ); // Default factory mlt_properties_set( properties, "factory", mlt_environment( "MLT_PRODUCER" ) ); @@ -1354,5 +1348,5 @@ mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type // Inform apps and framework that this is a video only transition mlt_properties_set_int( properties, "_transition_type", 1 ); } - return this; + return self; }