X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avcolour_space.c;h=9c9747277516029dfb1aa8bff62ed8240c304e12;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=53b6780c2c3321890a043763096112e1a10d11b4;hpb=07b78feef159c84412ba097240d9755381c6fbd6;p=melted

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 53b6780..9c97472 100644
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2004-2005 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_avcolour_space.h"
@@ -24,10 +24,21 @@
 
 // ffmpeg Header files
 #include <avformat.h>
+#ifdef SWSCALE
+#include <swscale.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 
+static inline int is_big_endian( )
+{
+	union { int i; char c[ 4 ]; } big_endian_test;
+	big_endian_test.i = 1;
+
+	return big_endian_test.c[ 0 ] != 1;
+}
+
 static inline int convert_mlt_to_av_cs( mlt_image_format format )
 {
 	int value = 0;
@@ -59,9 +70,17 @@ static inline void convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in
 {
 	AVPicture input;
 	AVPicture output;
-	avpicture_fill( &output, out, out_fmt, width, height );
 	avpicture_fill( &input, in, in_fmt, width, height );
+	avpicture_fill( &output, out, out_fmt, width, height );
+#ifdef SWSCALE
+	struct SwsContext *context = sws_getContext( width, height, in_fmt,
+		width, height, out_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+	sws_scale( context, input.data, input.linesize, 0, height,
+		output.data, output.linesize);
+	sws_freeContext( context );
+#else
 	img_convert( &output, out_fmt, &input, in_fmt, width, height );
+#endif
 }
 
 /** Do it :-).
@@ -96,10 +115,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 			register uint8_t *bits = *image;
 			register int n = ( len + 7 ) / 8;
 
-			// TODO: Proper check for big endian systems
-			#ifndef __DARWIN__
-			bits += 3;
-			#endif
+			if( !is_big_endian( ) )
+				bits += 3;
 
 			// Extract alpha mask from the image using Duff's Device
 			switch( len % 8 )
@@ -134,11 +151,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 				register uint8_t *bits = *image;
 				register int len = *width * *height;
 				register int n = ( len + 7 ) / 8;
-
-				// TODO: Proper check for big endian systems
-				#ifndef __DARWIN__
-				bits += 3;
-				#endif
+				
+				if( !is_big_endian( ) )
+					bits += 3;
 
 				// Merge the alpha mask into the RGB image using Duff's Device
 				switch( len % 8 )