X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=e7e7fbe2ec3c44c4ecc3de70ad5ad109a5a1cca9;hb=1ea14d21b89c84e7766fba4f6aea0f852c906594;hp=81e850d5d73741cce78520eb874a28e626b04caa;hpb=d9404934027fee5f526cf279928baf157b0e2300;p=melted

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 81e850d..e7e7fbe 100644
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * 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>
@@ -27,6 +26,16 @@
 #include <stdlib.h>
 #include <math.h>
 
+/** Swapbytes inline.
+*/
+
+static inline void swap_bytes( uint8_t *upper, uint8_t *lower )
+{
+	uint8_t t = *lower;
+	*lower = *upper;
+	*upper = t;
+}
+
 /** Do it :-).
 */
 
@@ -43,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;
@@ -109,28 +125,22 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		// Get the requested scale operation
 		char *op = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "scale" );
 
+		// Provides a manual override for misreported field order
+		if ( mlt_properties_get( properties, "meta.top_field_first" ) )
+			mlt_properties_set_int( properties, "top_field_first", mlt_properties_get_int( properties, "meta.top_field_first" ) );
+
 		// Correct field order if needed
-		if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 || mlt_properties_get_int( properties, "meta.top_field_first" ) == 1 )
+		if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 )
 		{
 			// Get the input image, width and height
 			int size;
 			uint8_t *image = mlt_properties_get_data( properties, "image", &size );
-
-			// Keep the original image around to be destroyed on frame close
-			mlt_properties_rename( properties, "image", "original_image" );
-
-			// Duplicate the last line in the field to avoid artifact
-			memcpy( image + oheight * owidth * 2, image + oheight * owidth * 2 - owidth * 4, owidth * 2 );
-
-			// Offset the image pointer by one line
-			image += owidth * 2;
-			size -= owidth * 2;
+			uint8_t *ptr = image + owidth * 2;
+			memmove( ptr, image, size - owidth * 2 );
 			
-			// Set the new image pointer with no destructor
-			mlt_properties_set_data( properties, "image", image, size, NULL, NULL );
-
 			// Set the normalised field order
 			mlt_properties_set_int( properties, "top_field_first", 0 );
+			mlt_properties_set_int( properties, "meta.top_field_first", 0 );
 		}
 
 		if ( !strcmp( op, "affine" ) )
@@ -171,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 )