Merge ../mlt

[melted] / src / modules / core / filter_rescale.c

diff --git a/src/modules/core/filter_rescale.c b/src/modules/core/filter_rescale.c
index 1992cd4..25ca5fc 100644 (file)
--- a/src/modules/core/filter_rescale.c
+++ b/src/modules/core/filter_rescale.c
@@ -18,8 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_rescale.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -29,6 +28,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 +46,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 +72,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 +99,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 +117,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 +144,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 :-).
@@ -192,7 +206,12 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                        mlt_properties_set_int( properties, "rescale_width", iwidth );
                        mlt_properties_set_int( properties, "rescale_height", iheight );
                }
-       
+
+               // Deinterlace if height is changing to prevent fields mixing on interpolation
+               // One exception: non-interpolated, integral scaling
+               if ( iheight != oheight && ( strcmp( interps, "nearest" ) || ( iheight % oheight != 0 ) ) )
+                       mlt_properties_set_int( properties, "consumer_deinterlace", 1 );
+
                // Get the image as requested
                mlt_frame_get_image( this, image, format, &iwidth, &iheight, writable );
 
@@ -280,7 +299,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_rescale_init( char *arg )
+mlt_filter filter_rescale_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        // Create a new scaler
        mlt_filter this = mlt_filter_new( );