X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avcolour_space.c;h=9c9747277516029dfb1aa8bff62ed8240c304e12;hb=78b58b5474240fc011c0bf05c517b76961613ad8;hp=50eb2ce46b613f17565db01dd866f4e89cd30288;hpb=78cb03b80c9483db3f3c6bb44eb420da69ca60c0;p=melted

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 50eb2ce..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 :-).
@@ -87,12 +106,41 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		int size = avpicture_get_size( out_fmt, *width, *height );
 		uint8_t *output = mlt_pool_alloc( size );
 		convert_image( output, *image, out_fmt, in_fmt, *width, *height );
+
+		// Special case for alpha rgb input
+		if ( *format == mlt_image_rgb24a )
+		{
+			register uint8_t *alpha = mlt_frame_get_alpha_mask( this );
+			register int len = *width * *height;
+			register uint8_t *bits = *image;
+			register int n = ( len + 7 ) / 8;
+
+			if( !is_big_endian( ) )
+				bits += 3;
+
+			// Extract alpha mask from the image using Duff's Device
+			switch( len % 8 )
+			{
+				case 0:	do { *alpha ++ = *bits; bits += 4;
+				case 7:		 *alpha ++ = *bits; bits += 4;
+				case 6:		 *alpha ++ = *bits; bits += 4;
+				case 5:		 *alpha ++ = *bits; bits += 4;
+				case 4:		 *alpha ++ = *bits; bits += 4;
+				case 3:		 *alpha ++ = *bits; bits += 4;
+				case 2:		 *alpha ++ = *bits; bits += 4;
+				case 1:		 *alpha ++ = *bits; bits += 4;
+						}
+						while( --n );
+			}
+		}
+
+		// Update the output
 		*image = output;
 		*format = output_format;
 		mlt_properties_set_data( properties, "image", output, size, mlt_pool_release, NULL );
 		mlt_properties_set_int( properties, "format", output_format );
 
-		// Special case for alpha rgb - merge the alpha mask when it exists
+		// Special case for alpha rgb output
 		if ( *format == mlt_image_rgb24a )
 		{
 			// Fetch the alpha
@@ -103,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 )