From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 4 Jun 2007 06:09:54 +0000 (+0000)
Subject: bugfix core/filter_rescale segfault on scaling alpha that was already to correct... 
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=46ccd5ad41f67bebfbe6f67b8b5733bf635089f6;p=melted

bugfix core/filter_rescale segfault on scaling alpha that was already to correct scale (e.g. mlt_bouncy_ball)

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@977 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/core/filter_rescale.c b/src/modules/core/filter_rescale.c
index 1992cd4..e823616 100644
--- a/src/modules/core/filter_rescale.c
+++ b/src/modules/core/filter_rescale.c
@@ -29,6 +29,8 @@
 
 typedef int ( *image_scaler )( mlt_frame this, uint8_t **image, mlt_image_format iformat, mlt_image_format oformat, int iwidth, int iheight, int owidth, int oheight );
 
+static void scale_alpha( mlt_frame this, int iwidth, int iheight, int owidth, int oheight );
+
 static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iformat, mlt_image_format oformat, int iwidth, int iheight, int owidth, int oheight )
 {
 	// Get the properties
@@ -45,6 +47,12 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform
 		
 		// Return the output
 		*image = mlt_properties_get_data( properties, "image", NULL );
+
+		// Scale the alpha channel only if exists and not correct size
+		int alpha_size = 0;
+		mlt_properties_get_data( properties, "alpha", &alpha_size );
+		if ( alpha_size > 0 && alpha_size != ( owidth * oheight ) )
+			scale_alpha( this, iwidth, iheight, owidth, oheight );
 	}
 	else if ( iformat == mlt_image_rgb24 || iformat == mlt_image_rgb24a )
 	{
@@ -65,6 +73,8 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform
 				mlt_convert_rgb24a_to_yuv422( *image, iwidth, iheight, iwidth * 4, output, alpha );
 
 				mlt_properties_set_data( properties, "alpha", alpha, iwidth * ( iheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL );
+
+				scale_alpha( this, iwidth, iheight, owidth, oheight );
 			}
 			else
 			{
@@ -90,6 +100,8 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform
 				mlt_convert_rgb24a_to_yuv422( *image, owidth, oheight, owidth * 4, output, alpha );
 
 				mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL );
+
+				scale_alpha( this, iwidth, iheight, owidth, oheight );
 			}
 			else
 			{
@@ -106,6 +118,11 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform
 		*image = output;
 	}
 
+	return 0;
+}
+
+static void scale_alpha( mlt_frame this, int iwidth, int iheight, int owidth, int oheight )
+{
 	// Scale the alpha
 	uint8_t *output = NULL;
 	uint8_t *input = mlt_frame_get_alpha_mask( this );
@@ -128,8 +145,6 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform
 		// Set it back on the frame
 		mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "alpha", output, owidth * oheight, mlt_pool_release, NULL );
 	}
-
-	return 0;
 }
 
 /** Do it :-).