X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=005be7dbd50aaf698ccad9998f553429b693f0b4;hb=54c4ca0a5b12fd08be8f1097648530f097d8d0c5;hp=bd8841b07cc1c5aa610fe16a17178ad009b485de;hpb=b6232c93db568b3becc00019ca18e31bd92e54b5;p=melted

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index bd8841b..005be7d 100644
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -3,19 +3,19 @@
  * 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"
@@ -25,6 +25,17 @@
 #include <stdio.h>
 #include <string.h>
 #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 :-).
 */
@@ -75,19 +86,19 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		//fprintf( stderr, "normalised %dx%d output %dx%d %f %f\n", normalised_width, normalised_height, owidth, oheight, ( float )output_ar, ( float )mlt_properties_get_double( properties, "consumer_aspect_ratio" ) * owidth / oheight );
 
 		// Optimised for the input_ar > output_ar case (e.g. widescreen on standard)
-		int scaled_width = input_ar / output_ar * normalised_width + 0.5;
+		int scaled_width = rint( 0.5 + ( input_ar * normalised_width ) / output_ar );
 		int scaled_height = normalised_height;
 
 		// Now ensure that our images fit in the output frame
 		if ( scaled_width > normalised_width )
 		{
 			scaled_width = normalised_width;
-			scaled_height = output_ar / input_ar * normalised_height + 0.5;
+			scaled_height = rint( 0.5 + ( output_ar * normalised_height ) / input_ar );
 		}
 
 		// Now calculate the actual image size that we want
-		owidth = scaled_width * owidth / normalised_width;
-		oheight = scaled_height * oheight / normalised_height;
+		owidth = rint( 0.5 + scaled_width * owidth / normalised_width );
+		oheight = rint( 0.5 + scaled_height * oheight / normalised_height );
 
 		// Tell frame we have conformed the aspect to the consumer
 		mlt_frame_set_aspect_ratio( this, mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
@@ -108,28 +119,36 @@ 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 )
 		{
 			// 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;
-			
-			// Set the new image pointer with no destructor
-			mlt_properties_set_data( properties, "image", image, size, NULL, NULL );
+			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;
+			}
 
 			// 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" ) )