X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=9b9eada2d55c224e29650e13f37b2a640f47706d;hb=facc6328e46eb0c973c6293390a14258abf071d4;hp=83d21d31d19251e858fb37d7110667d28aec8683;hpb=589c1b3fc635b5c7fb28c4c7d9f12054bd5b4b25;p=mlt

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 83d21d31..9b9eada2 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -355,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 )
@@ -366,7 +366,7 @@ 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"
+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
 
 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 )
@@ -460,7 +460,7 @@ 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 + 50 ) / 100;
+	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
@@ -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;
 	}
 
@@ -675,7 +674,7 @@ static uint16_t* get_luma( mlt_transition self, 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
@@ -772,8 +771,8 @@ static int get_b_frame_image( mlt_transition self, mlt_frame b_frame, uint8_t **
 	// 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" );
 		int scaled_width = rint( ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width );
 		int scaled_height = real_height;
@@ -786,8 +785,8 @@ static int get_b_frame_image( mlt_transition self, 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" );
 		int scaled_width = rint( ( input_ar == 0.0 ? output_ar : input_ar ) / output_ar * real_width );
 		int scaled_height = real_height;
@@ -1327,7 +1326,7 @@ static mlt_frame composite_process( mlt_transition self, mlt_frame a_frame, mlt_
 
 mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
-	mlt_transition self = calloc( sizeof( struct mlt_transition_s ), 1 );
+	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( self );