X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=e2081eac7a6ada50968b5cdc935871dadb9d5c8b;hb=281765e24676ab16c2e96b20cc82a2422fc83f86;hp=b44912c0087cbd6a5ba9d7c012ca1dabb3bc6cee;hpb=588ce5076b7f6b14aa4c390c88cebb8f8cc3cb63;p=mlt

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index b44912c0..e2081eac 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <math.h>
 
-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, double softness );
+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, uint32_t step );
 
 /** Geometry struct.
 */
@@ -98,10 +98,8 @@ static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_w
 	// 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( this );
 	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;
@@ -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 );
@@ -368,11 +353,9 @@ static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int hei
 		*p++ = ( image[ i ] - 16 ) * 299; // 299 = 65535 / 219
 }
 
-static inline int calculate_mix( uint16_t *luma, int j, double soft, int weight, int alpha )
+static inline int calculate_mix( uint16_t *luma, int j, int softness, int weight, int alpha, uint32_t step )
 {
-	int32_t i_softness = soft * ( 1 << 16 );
-	uint32_t a = ( 1.0 + soft ) * weight / 100 * ( ( 1 << 16 ) - 1 );
-	return ( ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + i_softness, a ) * alpha ) >> 8;
+	return ( ( luma ? smoothstep( luma[ j ], luma[ j ] + softness, step ) : weight ) * alpha ) >> 8;
 }
 
 static inline uint8_t sample_mix( uint8_t dest, uint8_t src, int mix )
@@ -382,15 +365,30 @@ 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)
+#include "composite_line_yuv_sse2_simple.c"
+#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, double soft )
+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 )
 	{
-		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ );
+		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 );
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
@@ -400,14 +398,14 @@ static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t
 	}
 }
 
-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, double soft )
+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 soft, uint32_t step )
 {
 	register int j;
 	register int mix;
 
 	for ( j = 0; j < width; j ++ )
 	{
-		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ | *alpha_a );
+		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ | *alpha_a, step );
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
@@ -416,14 +414,14 @@ static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8
 	}
 }
 
-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, double soft )
+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 soft, uint32_t step  )
 {
 	register int j;
 	register int mix;
 
 	for ( j = 0; j < width; j ++ )
 	{
-		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ & *alpha_a );
+		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ & *alpha_a, step );
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
@@ -432,14 +430,14 @@ static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint
 	}
 }
 
-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, double soft )
+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 soft, uint32_t step )
 {
 	register int j;
 	register int mix;
 
 	for ( j = 0; j < width; j ++ )
 	{
-		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ ^ *alpha_a );
+		mix = calculate_mix( luma, j, soft, weight, *alpha_b ++ ^ *alpha_a, step );
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
@@ -461,7 +459,10 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	int bpp = 2;
 	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 + 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 );
 	int y = rint( geometry.item.y * height_dest / geometry.nh );
@@ -567,7 +568,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	// now do the compositing only to cropped extents
 	for ( i = 0; i < height_src; i += step )
 	{
-		line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, geometry.item.mix, p_luma, softness );
+		line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, weight, p_luma, i_softness, luma_step );
 
 		p_src += stride_src;
 		p_dest += stride_dest;
@@ -765,6 +766,7 @@ 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 );
 	uint8_t resize_alpha = mlt_properties_get_int( b_props, "resize_alpha" );
+	double consumer_ar = mlt_profile_sar( mlt_service_profile( MLT_TRANSITION_SERVICE(this) ) );
 
 	// 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
@@ -773,7 +775,6 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 		int real_width = get_value( b_props, "real_width", "width" );
 		int real_height = get_value( b_props, "real_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 );
@@ -790,7 +791,6 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 		int real_width = get_value( b_props, "real_width", "width" );
 		int real_height = get_value( b_props, "real_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 );
@@ -852,12 +852,18 @@ 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);
 
 	ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 );
 
+	// composite_yuv uses geometry->sw to determine source stride, which
+	// should equal the image width if not using crop property.
+	if ( !mlt_properties_get( properties, "crop" ) )
+		geometry->sw = *width;
+
 	// Set the frame back
 	mlt_properties_set_int( b_props, "resize_alpha", resize_alpha );
 
@@ -875,9 +881,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( this );
 			double cycle = mlt_properties_get_double( properties, "cycle" );
 
 			// Allow a geometry repeat cycle
@@ -930,7 +934,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
 	{
@@ -945,7 +949,7 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s
 		}
 		else
 		{
-			int length = mlt_transition_get_out( this ) - mlt_transition_get_in( this ) + 1;
+			mlt_position length = mlt_transition_get_length( this );
 			double cycle = mlt_properties_get_double( properties, "cycle" );
 			if ( cycle > 1 )
 				length = cycle;
@@ -993,10 +997,14 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
 	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;
@@ -1029,9 +1037,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;
@@ -1041,7 +1049,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 );
@@ -1127,24 +1135,18 @@ 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( this, a_frame );
+		mlt_position length = mlt_transition_get_length( this );
 
 		// Get the image from the b frame
 		uint8_t *image_b = NULL;
-		int width_b = *width;
-		int height_b = *height;
+		int width_b = *width > 0 ? *width : mlt_properties_get_int( a_props, "normalised_width" );
+		int height_b = *height > 0 ? *height : mlt_properties_get_int( a_props, "normalised_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" );
@@ -1152,11 +1154,12 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 		composite_calculate( this, &result, invert ? b_frame : a_frame, position );
 		mlt_service_unlock( MLT_TRANSITION_SERVICE( this ) );
 
-		// 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" ) && 
@@ -1217,7 +1220,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 ) );
 			char *operator = mlt_properties_get( properties, "operator" );
 
 			alpha_b = alpha_b == NULL ? mlt_frame_get_alpha_mask( b_frame ) : alpha_b;
@@ -1245,7 +1250,7 @@ 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
@@ -1332,7 +1337,7 @@ mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type
 		this->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" ) );
@@ -1340,6 +1345,9 @@ mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type
 		// Use alignment (and hence alpha of b frame)
 		mlt_properties_set_int( properties, "aligned", 1 );
 
+		// Default to progressive rendering
+		mlt_properties_set_int( properties, "progressive", 1 );
+		
 		// Inform apps and framework that this is a video only transition
 		mlt_properties_set_int( properties, "_transition_type", 1 );
 	}