X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_luma.c;h=a518e0666d7474e42ee6fd9b41cc2b6e35002567;hb=03fdfa6be1e0ff3c0a08b7587165ec32e99f1051;hp=bcc3737da217b9271d140492a5bc737f344f7842;hpb=94dce1aea965163f8dcd2f97271f2652abb0e62d;p=melted

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index bcc3737..a518e06 100644
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -32,10 +32,9 @@
 typedef struct 
 {
 	struct mlt_transition_s parent;
-	char *filename;
 	int width;
 	int height;
-	float *bitmap;
+	uint16_t *bitmap;
 }
 transition_luma;
 
@@ -43,22 +42,6 @@ transition_luma;
 // forward declarations
 static void transition_close( mlt_transition parent );
 
-
-// image processing functions
-
-static inline float smoothstep( float edge1, float edge2, float a )
-{
-	if ( a < edge1 )
-		return 0.0;
-
-	if ( a >= edge2 )
-		return 1.0;
-
-	a = ( a - edge1 ) / ( edge2 - edge1 );
-
-	return ( a * a * ( 3 - 2 * a ) );
-}
-
 /** Calculate the position for this frame.
 */
 
@@ -89,107 +72,51 @@ static float delta_calculate( mlt_transition this, mlt_frame frame )
 
 	// Now do the calcs
 	float x = ( float )( position - in ) / ( float )( out - in + 1 );
-	position++;
-	float y = ( float )( position - in ) / ( float )( out - in + 1 );
+	float y = ( float )( position + 1 - in ) / ( float )( out - in + 1 );
 
 	return ( y - x ) / 2.0;
 }
 
-static int frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight, int *width, int *height )
+static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, int width, int height )
 {
 	int ret = 0;
-	int width_src = *width, height_src = *height;
-	int width_dest = *width, height_dest = *height;
-	mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422;
+	int width_src = width, height_src = height;
+	mlt_image_format format = mlt_image_yuv422;
 	uint8_t *p_src, *p_dest;
-	int i, j;
-	int stride_src;
-	int stride_dest;
-	int x_src = 0, y_src = 0;
+	uint8_t *p;
+	uint8_t *limit;
 
-	// optimization point - no work to do
-	if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) )
-		return ret;
+	int32_t weigh = weight * ( 1 << 16 );
+	int32_t weigh_complement = ( 1 - weight ) * ( 1 << 16 );
 
-	format_src = mlt_image_yuv422;
-	format_dest = mlt_image_yuv422;
+	mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
+	mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
 
-	mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
-	mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
+	p = p_dest;
+	limit = p_dest + height_src * width_src * 2;
 
-	stride_src = width_src * 2;
-	stride_dest = width_dest * 2;
-	
-	// crop overlay off the left edge of frame
-	if ( x < 0 )
+	while ( p < limit )
 	{
-		x_src = -x;
-		width_src -= x_src;
-		x = 0;
+		*p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
+		*p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
 	}
-	
-	// crop overlay beyond right edge of frame
-	else if ( x + width_src > width_dest )
-		width_src = width_dest - x;
 
-	// crop overlay off the top edge of the frame
-	if ( y < 0 )
-	{
-		y_src = -y;
-		height_src -= y_src;
-	}
-	// crop overlay below bottom edge of frame
-	else if ( y + height_src > height_dest )
-		height_src = height_dest - y;
-
-	// offset pointer into overlay buffer based on cropping
-	p_src += x_src * 2 + y_src * stride_src;
-
-	// offset pointer into frame buffer based upon positive, even coordinates only!
-	p_dest += ( x < 0 ? 0 : x ) * 2 + ( y < 0 ? 0 : y ) * stride_dest;
-
-	// Get the alpha channel of the overlay
-	uint8_t *p_alpha = mlt_frame_get_alpha_mask( that );
-
-	// offset pointer into alpha channel based upon cropping
-	if ( p_alpha )
-		p_alpha += x_src + y_src * stride_src / 2;
-
-	uint8_t *p = p_src;
-	uint8_t *q = p_dest;
-	uint8_t *o = p_dest;
-	uint8_t *z = p_alpha;
+	return ret;
+}
 
-	uint8_t Y;
-	uint8_t UV;
-	uint8_t a;
-	float value;
+// image processing functions
 
-	// now do the compositing only to cropped extents
-	for ( i = 0; i < height_src; i++ )
-	{
-		p = p_src;
-		q = p_dest;
-		o = p_dest;
-		z = p_alpha;
+static uint32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
+{
+	if ( a < edge1 )
+		return 0;
 
-		for ( j = 0; j < width_src; j ++ )
-		{
-			Y = *p ++;
-			UV = *p ++;
-			a = ( z == NULL ) ? 255 : *z ++;
-			value = ( weight * ( float ) a / 255.0 );
-			*o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) );
-			*o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) );
-		}
+	if ( a >= edge2 )
+		return 0x10000;
 
-		p_src += stride_src;
-		p_dest += stride_dest;
-		if ( p_alpha )
-			p_alpha += stride_src / 2;
-	}
+	a = ( ( a - edge1 ) << 16 ) / ( edge2 - edge1 );
 
-	return ret;
+	return ( ( ( a * a ) >> 16 )  * ( ( 3 << 16 ) - ( 2 * a ) ) ) >> 16;
 }
 
 /** powerful stuff
@@ -197,7 +124,7 @@ static int frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, fl
     \param field_order -1 = progressive, 0 = lower field first, 1 = top field first
 */
 static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width, int luma_height,
-							float *luma_bitmap, float pos, float frame_delta, float softness, int field_order,
+							uint16_t *luma_bitmap, float pos, float frame_delta, float softness, int field_order,
 							int *width, int *height )
 {
 	int width_src = *width, height_src = *height;
@@ -207,60 +134,77 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
 	int i, j;
 	int stride_src;
 	int stride_dest;
-	float weight = 0;
-	int field;
+	uint16_t weight = 0;
 
 	format_src = mlt_image_yuv422;
 	format_dest = mlt_image_yuv422;
 
-	mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
-	mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
+	mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 );
+	mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 );
 
 	stride_src = width_src * 2;
 	stride_dest = width_dest * 2;
 
 	// Offset the position based on which field we're looking at ...
-	float field_pos[ 2 ];
-	field_pos[ 0 ] = pos + ( ( field_order == 0 ? 1 : 0 ) * frame_delta * 0.5 );
-	field_pos[ 1 ] = pos + ( ( field_order == 0 ? 0 : 1 ) * frame_delta * 0.5 );
+	int32_t field_pos[ 2 ];
+	field_pos[ 0 ] = ( pos + ( ( field_order == 0 ? 1 : 0 ) * frame_delta * 0.5 ) ) * ( 1 << 16 ) * ( 1.0 + softness );
+	field_pos[ 1 ] = ( pos + ( ( field_order == 0 ? 0 : 1 ) * frame_delta * 0.5 ) ) * ( 1 << 16 ) * ( 1.0 + softness );
 
-	// adjust the position for the softness level
-	field_pos[ 0 ] *= ( 1.0 + softness );
-	field_pos[ 1 ] *= ( 1.0 + softness );
+	register uint8_t *p;
+	register uint8_t *q;
+	register uint8_t *o;
+	uint16_t  *l;
 
-	uint8_t *p;
-	uint8_t *q;
-	uint8_t *o;
-	float  *l;
+	uint32_t value;
+
+	int32_t x_diff = ( luma_width << 16 ) / *width;
+	int32_t y_diff = ( luma_height << 16 ) / *height;
+	int32_t x_offset = 0;
+	int32_t y_offset = 0;
+	uint8_t *p_row;
+	uint8_t *q_row;
+
+	int32_t i_softness = softness * ( 1 << 16 );
 
-	uint8_t y;
-	uint8_t uv;
-   	float value;
+	int field_count = field_order <= 0 ? 1 : 2;
+	int field_stride_src = field_count * stride_src;
+	int field_stride_dest = field_count * stride_dest;
 
-	float x_diff = ( float )luma_width / ( float )*width;
-	float y_diff = ( float )luma_height / ( float )*height;
+	int field = 0;
 
 	// composite using luma map
-	for ( field = 0; field < ( field_order < 0 ? 1 : 2 ); ++field )
+	while ( field < field_count )
 	{
-		for ( i = field; i < height_src; i += ( field_order < 0 ? 1 : 2 ) )
-		{
-			p = &p_src[ i * stride_src ];
-			q = &p_dest[ i * stride_dest ];
-			o = &p_dest[ i * stride_dest ];
-			l = &luma_bitmap[ ( int )( ( float )i * y_diff ) * luma_width ];
+		p_row = p_src + field * stride_src;
+		q_row = p_dest + field * stride_dest;
+		y_offset = ( field * luma_width ) << 16;
+		i = field;
 
-			for ( j = 0; j < width_src; j ++ )
+		while ( i < height_src )
+		{
+			p = p_row;
+			q = q_row;
+			o = q;
+			l = luma_bitmap + ( y_offset >> 16 ) * ( luma_width * field_count );
+			x_offset = 0;
+			j = width_src;
+
+			while( j -- )
 			{
-				y = *p ++;
-				uv = *p ++;
-             	weight = l[ ( int )( ( float )j * x_diff ) ];
-   				value = smoothstep( weight, weight + softness, field_pos[ field ] );
-
-				*o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
-				*o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
+             	weight = l[ x_offset >> 16 ];
+   				value = smoothstep( weight, i_softness + weight, field_pos[ field ] );
+				*o ++ = ( *p ++ * value + *q++ * ( ( 1 << 16 ) - value ) ) >> 16;
+				*o ++ = ( *p ++ * value + *q++ * ( ( 1 << 16 ) - value ) ) >> 16;
+				x_offset += x_diff;
 			}
+
+			y_offset += y_diff;
+			i += field_count;
+			p_row += field_stride_src;
+			q_row += field_stride_dest;
 		}
+
+		field ++;
 	}
 }
 
@@ -283,7 +227,7 @@ static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_form
 	float frame_delta = mlt_properties_get_double( b_props, "luma.delta" );
 	int luma_width = mlt_properties_get_int( b_props, "luma.width" );
 	int luma_height = mlt_properties_get_int( b_props, "luma.height" );
-	float *luma_bitmap = mlt_properties_get_data( b_props, "luma.bitmap", NULL );
+	uint16_t *luma_bitmap = mlt_properties_get_data( b_props, "luma.bitmap", NULL );
 	float luma_softness = mlt_properties_get_double( b_props, "luma.softness" );
 	int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
 			mlt_properties_get_int( a_props, "consumer_progressive" ) ||
@@ -310,7 +254,7 @@ static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_form
 			luma_softness, progressive ? -1 : top_field_first, width, height );
 	else
 		// Dissolve the frames using the time offset for mix value
-		frame_composite_yuv( this, b_frame, 0, 0, mix, width, height );
+		dissolve_yuv( this, b_frame, mix, *width, *height );
 
 	// Extract the a_frame image info
 	*width = mlt_properties_get_int( a_props, "width" );
@@ -323,9 +267,8 @@ static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_form
 /** Load the luma map from PGM stream.
 */
 
-static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
+static void luma_read_pgm( FILE *f, uint16_t **map, int *width, int *height )
 {
-	void *release = NULL;
 	uint8_t *data = NULL;
 	while (1)
 	{
@@ -333,7 +276,7 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 		int i = 2;
 		int maxval;
 		int bpp;
-		float *p;
+		uint16_t *p;
 		
 		line[127] = '\0';
 
@@ -380,7 +323,7 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 		bpp = maxval > 255 ? 2 : 1;
 		
 		// allocate temporary storage for the raw data
-		data = mlt_pool_allocate( *width * *height * bpp, &release );
+		data = mlt_pool_alloc( *width * *height * bpp );
 		if ( data == NULL )
 			break;
 
@@ -389,9 +332,7 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 			break;
 		
 		// allocate the luma bitmap
-		// IRRIGATE ME
-		// Difficult here - need to change the function prototype....
-		*map =  p = (float*) malloc( *width * *height * sizeof( float ) );
+		*map = p = (uint16_t*)mlt_pool_alloc( *width * *height * sizeof( uint16_t ) );
 		if ( *map == NULL )
 			break;
 
@@ -399,16 +340,16 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 		for ( i = 0; i < *width * *height * bpp; i += bpp )
 		{
 			if ( bpp == 1 )
-				*p++ = (float) data[ i ] / (float) maxval;
+				*p++ = data[ i ] << 8;
 			else
-				*p++ = (float) ( ( data[ i ] << 8 ) + data[ i+1 ] ) / (float) maxval;
+				*p++ = ( data[ i ] << 8 ) + data[ i+1 ];
 		}
 
 		break;
 	}
 		
-	if ( release != NULL )
-		mlt_pool_release( release );
+	if ( data != NULL )
+		mlt_pool_release( data );
 }
 
 
@@ -426,17 +367,12 @@ static mlt_frame transition_process( mlt_transition transition, mlt_frame a_fram
 	mlt_properties b_props = mlt_frame_properties( b_frame );
 
 	// If the filename property changed, reload the map
-	char *luma_file = mlt_properties_get( properties, "resource" );
-	if ( luma_file != NULL && ( this->filename == NULL || ( this->filename && strcmp( luma_file, this->filename ) ) ) )
+	char *lumafile = mlt_properties_get( properties, "resource" );
+	if ( this->bitmap == NULL && lumafile != NULL )
 	{
-		FILE *pipe;
-		
-		free( this->filename );
-		this->filename = strdup( luma_file );
-		pipe = fopen( luma_file, "r" );
+		FILE *pipe = fopen( lumafile, "r" );
 		if ( pipe != NULL )
 		{
-			free( this->bitmap );
 			luma_read_pgm( pipe, &this->bitmap, &this->width, &this->height );
 			fclose( pipe );
 		}
@@ -481,8 +417,7 @@ mlt_transition transition_luma_init( char *lumafile )
 static void transition_close( mlt_transition parent )
 {
 	transition_luma *this = (transition_luma*) parent->child;
-	free( this->bitmap );
-	free( this->filename );
+	mlt_pool_release( this->bitmap );
 	free( this );
 }