X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_luma.c;h=024397421e919877ac9313b666c250d7fd510b22;hb=f4fef6a77643c2ec85e00f0afc28d88fe0fbd4a9;hp=8db5d4df732a3f88266b3838343c9a9216b4aba1;hpb=e4f02fbdb9f02fefcd2a178be08cca9963449815;p=melted

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 8db5d4d..0243974 100644
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -78,6 +78,10 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
 	mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
 	mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
 
+	// Pick the lesser of two evils ;-)
+	width_src = width_src > width ? width : width_src;
+	height_src = height_src > height ? height : height_src;
+	
 	p = p_dest;
 	limit = p_dest + height_src * width_src * 2;
 
@@ -92,7 +96,7 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
 
 // image processing functions
 
-static inline uint32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
 {
 	if ( a < edge1 )
 		return 0;
@@ -128,6 +132,10 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
 	mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 );
 	mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 );
 
+	// Pick the lesser of two evils ;-)
+	width_src = width_src > width_dest ? width_dest : width_src;
+	height_src = height_src > height_dest ? height_dest : height_src;
+	
 	stride_src = width_src * 2;
 	stride_dest = width_dest * 2;
 
@@ -152,10 +160,9 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
 
 	int32_t i_softness = softness * ( 1 << 16 );
 
-	int field_count = field_order <= 0 ? 1 : 2;
+	int field_count = field_order < 0 ? 1 : 2;
 	int field_stride_src = field_count * stride_src;
 	int field_stride_dest = field_count * stride_dest;
-
 	int field = 0;
 
 	// composite using luma map
@@ -163,7 +170,7 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
 	{
 		p_row = p_src + field * stride_src;
 		q_row = p_dest + field * stride_dest;
-		y_offset = ( field * luma_width ) << 16;
+		y_offset = field << 16;
 		i = field;
 
 		while ( i < height_src )
@@ -334,6 +341,9 @@ static void luma_read_rgb24( uint8_t *image, uint16_t **map, int width, int heig
 
 static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
+	// Get the b frame from the stack
+	mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
+
 	// Get the transition object
 	mlt_transition transition = mlt_frame_pop_service( a_frame );
 
@@ -343,9 +353,6 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	// Get the properties of the a frame
 	mlt_properties a_props = mlt_frame_properties( a_frame );
 
-	// Get the b frame from the stack
-	mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
-
 	// Get the properties of the b frame
 	mlt_properties b_props = mlt_frame_properties( b_frame );
 
@@ -407,11 +414,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 					uint8_t *luma_image;
 					mlt_image_format luma_format = mlt_image_yuv422;
 
-					// Request a luma image the size of transition image request
-					luma_width = *width;
-					luma_height = *height;
-
 					// Get image from the luma producer
+					mlt_properties_set( mlt_frame_properties( luma_frame ), "rescale.interp", "none" );
 					mlt_frame_get_image( luma_frame, &luma_image, &luma_format, &luma_width, &luma_height, 0 );
 
 					// Generate the luma map
@@ -441,16 +445,19 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	float frame_delta = delta_calculate( transition, a_frame );
 	
 	float luma_softness = mlt_properties_get_double( properties, "softness" );
-	int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
+	int progressive = 
 			mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+			mlt_properties_get_int( properties, "progressive" ) ||
 			mlt_properties_get_int( b_props, "luma.progressive" );
 	int top_field_first =  mlt_properties_get_int( b_props, "top_field_first" );
 	int reverse = mlt_properties_get_int( properties, "reverse" );
 
 	// Since we are the consumer of the b_frame, we must pass along this
 	// consumer property from the a_frame
-	mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
-	mlt_properties_set_double( b_props, "consumer_scale", mlt_properties_get_double( a_props, "consumer_scale" ) );
+	if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
+		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "aspect_ratio" ) );
+	else
+		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
 
 	// Honour the reverse here
 	if ( mix >= 1.0 )
@@ -493,12 +500,12 @@ static mlt_frame transition_process( mlt_transition transition, mlt_frame a_fram
 	// Push the transition on to the frame
 	mlt_frame_push_service( a_frame, transition );
 
-	// Push the transition method
-	mlt_frame_push_get_image( a_frame, transition_get_image );
-	
 	// Push the b_frame on to the stack
 	mlt_frame_push_frame( a_frame, b_frame );
 
+	// Push the transition method
+	mlt_frame_push_get_image( a_frame, transition_get_image );
+	
 	return a_frame;
 }