X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_luma.c;h=4b87b2ae675b7b8b7079ac04eeb67eab2f0acb09;hb=b5bf7e90101c8ff6efd2a1e993673e4f56735caf;hp=29eb09582d1de3192150c692a12ca170c7089662;hpb=1f6faabf5ef11e6321d186772d88fb6958cdd057;p=melted

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 29eb095..4b87b2a 100644
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -3,19 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * 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.
+ * Adapted from Kino Plugin Timfx, which is
+ * Copyright (C) 2002 Timothy M. Shead <tshead@k-3d.com>
  *
- * This program is distributed in the hope that it will be useful,
+ * 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 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 "transition_luma.h"
@@ -69,8 +72,10 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
 	int width_src = width, height_src = height;
 	mlt_image_format format = mlt_image_yuv422;
 	uint8_t *p_src, *p_dest;
-	uint8_t *p;
+	uint8_t *p, *q;
 	uint8_t *limit;
+	uint8_t *alpha_src;
+	uint8_t *alpha_dst;
 
 	int32_t weigh = weight * ( 1 << 16 );
 	int32_t weigh_complement = ( 1 - weight ) * ( 1 << 16 );
@@ -79,19 +84,23 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
 		mlt_properties_set( &that->parent, "distort", mlt_properties_get( &this->parent, "distort" ) );
 	mlt_properties_set_int( &that->parent, "consumer_deinterlace", mlt_properties_get_int( &this->parent, "consumer_deinterlace" ) );
 	mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
+	alpha_dst = mlt_frame_get_alpha_mask( this );
 	mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
+	alpha_src = mlt_frame_get_alpha_mask( that );
 
 	// Pick the lesser of two evils ;-)
 	width_src = width_src > width ? width : width_src;
 	height_src = height_src > height ? height : height_src;
 	
 	p = p_dest;
+	q = alpha_dst;
 	limit = p_dest + height_src * width_src * 2;
 
 	while ( p < limit )
 	{
 		*p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
 		*p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
+		*alpha_dst++ = ( *alpha_src++ * weigh + *q++ * weigh_complement ) >> 16;
 	}
 
 	return ret;
@@ -363,6 +372,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	// Get the properties of the b frame
 	mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
 
+	// This compositer is yuv422 only
+	*format = mlt_image_yuv422;
+
 	// The cached luma map information
 	int luma_width = mlt_properties_get_int( properties, "width" );
 	int luma_height = mlt_properties_get_int( properties, "height" );
@@ -506,6 +518,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	if ( mlt_properties_get( properties, "fixed" ) )
 		mix = mlt_properties_get_double( properties, "fixed" );
 
+
 	if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
 		// Composite the frames using a luma map
 		luma_composite( !invert ? a_frame : b_frame, !invert ? b_frame : a_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
@@ -514,6 +527,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 		// Dissolve the frames using the time offset for mix value
 		dissolve_yuv( a_frame, b_frame, mix, *width, *height );
 
+
 	// Extract the a_frame image info
 	*width = mlt_properties_get_int( !invert ? a_props : b_props, "width" );
 	*height = mlt_properties_get_int( !invert ? a_props : b_props, "height" );