filter_resize.c: fix field order correction

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

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 005be7d..e7e7fbe 100644 (file)
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -18,8 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_resize.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -53,6 +52,13 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        // Retrieve the aspect ratio
        double aspect_ratio = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( this ) );
 
+       // Correct Width/height if necessary
+       if ( *width == 0 || *height == 0 )
+       {
+               *width = mlt_properties_get_int( properties, "normalised_width" );
+               *height = mlt_properties_get_int( properties, "normalised_height" );
+       }
+
        // Assign requested width/height from our subordinate
        int owidth = *width;
        int oheight = *height;
@@ -130,22 +136,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                        int size;
                        uint8_t *image = mlt_properties_get_data( properties, "image", &size );
                        uint8_t *ptr = image + owidth * 2;
-                       int h = oheight / 2;
-                       int w = owidth;
-
-                       // Swap the lines around
-                       while( h -- )
-                       {
-                               w = owidth;
-                               while( w -- )
-                               {
-                                       swap_bytes( image ++, ptr ++ );
-                                       swap_bytes( image ++, ptr ++ );
-                               }
-                               image += owidth * 2;
-                               ptr += owidth * 2;
-                       }
-
+                       memmove( ptr, image, size - owidth * 2 );
+                       
                        // Set the normalised field order
                        mlt_properties_set_int( properties, "top_field_first", 0 );
                        mlt_properties_set_int( properties, "meta.top_field_first", 0 );
@@ -189,7 +181,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_resize_init( char *arg )
+mlt_filter filter_resize_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
        if ( mlt_filter_init( this, this ) == 0 )