X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=115978dd1cc5103c6c4fa69bd8d26c23a1c0eb01;hb=7651a182bf7191ab5db9b3741caeac2f86540281;hp=660f3c1de4ffe3ce00be55c7e8c4e2d8e8aa9647;hpb=da46016cc4e9c751ab346b9b8f451a59cd276b03;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 660f3c1..115978d 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -181,6 +181,22 @@ void *mlt_frame_pop_service( mlt_frame this )
 	return mlt_deque_pop_back( this->stack_image );
 }
 
+/** Push a service.
+*/
+
+int mlt_frame_push_service_int( mlt_frame this, int that )
+{
+	return mlt_deque_push_back_int( this->stack_image, that );
+}
+
+/** Pop a service.
+*/
+
+int mlt_frame_pop_service_int( mlt_frame this )
+{
+	return mlt_deque_pop_back_int( this->stack_image );
+}
+
 /** Push an audio item on the stack.
 */
 
@@ -205,7 +221,7 @@ mlt_deque mlt_frame_service_stack( mlt_frame this )
 	return this->stack_service;
 }
 
-/** [EXPERIMENTAL] Replace image stack with the information provided.
+/** Replace image stack with the information provided.
 
   	This might prove to be unreliable and restrictive - the idea is that a transition
 	which normally uses two images may decide to only use the b frame (ie: in the case
@@ -226,8 +242,7 @@ mlt_deque mlt_frame_service_stack( mlt_frame this )
 
 void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format format, int width, int height )
 {
-	// Herein lies the potential problem for this function - it makes a potentially 
-	// dangerous assumption that all content on the image stack can be removed without a destructor
+	// Remove all items from the stack
 	while( mlt_deque_pop_back( this->stack_image ) ) ;
 
 	// Update the information 
@@ -246,20 +261,21 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 	mlt_get_image get_image = mlt_frame_pop_get_image( this );
 	mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
+	int error = 0;
 
-	*width = *width >> 1 << 1;
-	
 	if ( get_image != NULL )
 	{
-		int error = 0;
+		mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
 		mlt_position position = mlt_frame_get_position( this );
 	   	error = get_image( this, buffer, format, width, height, writable );
+		mlt_properties_set_int( properties, "width", *width );
+		mlt_properties_set_int( properties, "height", *height );
+		mlt_properties_set_int( properties, "format", *format );
 		mlt_frame_set_position( this, position );
-		return error;
 	}
 	else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
 	{
-		*format = mlt_image_yuv422;
+		*format = mlt_properties_get_int( properties, "format" );
 		*buffer = mlt_properties_get_data( properties, "image", NULL );
 		*width = mlt_properties_get_int( properties, "width" );
 		*height = mlt_properties_get_int( properties, "height" );
@@ -278,6 +294,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 			mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
 			mlt_properties_set_int( properties, "width", *width );
 			mlt_properties_set_int( properties, "height", *height );
+			mlt_properties_set_int( properties, "format", *format );
 			mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
 		}
 		else
@@ -296,9 +313,10 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 		*height = *height == 0 ? 576 : *height;
 		size = *width * *height;
 
+		mlt_properties_set_int( properties, "format", *format );
 		mlt_properties_set_int( properties, "width", *width );
 		mlt_properties_set_int( properties, "height", *height );
-		mlt_properties_set_int( properties, "aspect_ratio", 1 );
+		mlt_properties_set_int( properties, "aspect_ratio", 0 );
 
 		switch( *format )
 		{
@@ -314,6 +332,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 					memset( *buffer, 255, size );
 				break;
 			case mlt_image_rgb24a:
+			case mlt_image_opengl:
 				size *= 4;
 				size += *width * 4;
 				*buffer = mlt_pool_alloc( size );
@@ -344,14 +363,30 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 		mlt_properties_set_int( properties, "test_image", 1 );
 	}
 
-	return 0;
+	mlt_properties_set_int( properties, "scaled_width", *width );
+	mlt_properties_set_int( properties, "scaled_height", *height );
+
+	return error;
 }
 
 uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
 {
-	if ( this != NULL && this->get_alpha_mask != NULL )
-		return this->get_alpha_mask( this );
-	return this == NULL ? NULL : mlt_properties_get_data( &this->parent, "alpha", NULL );
+	uint8_t *alpha = NULL;
+	if ( this != NULL )
+	{
+		if ( this->get_alpha_mask != NULL )
+			alpha = this->get_alpha_mask( this );
+		if ( alpha == NULL )
+			alpha = mlt_properties_get_data( &this->parent, "alpha", NULL );
+		if ( alpha == NULL )
+		{
+			int size = mlt_properties_get_int( &this->parent, "scaled_width" ) * mlt_properties_get_int( &this->parent, "scaled_height" );
+			alpha = mlt_pool_alloc( size );
+			memset( alpha, 255, size );
+			mlt_properties_set_data( &this->parent, "alpha", alpha, size, mlt_pool_release, NULL );
+		}
+	}
+	return alpha;
 }
 
 int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
@@ -394,10 +429,10 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
 	if ( mlt_properties_get( properties, "meta.volume" ) )
 	{
 		double value = mlt_properties_get_double( properties, "meta.volume" );
+
 		if ( value == 0.0 )
 		{
 			memset( *buffer, 0, *samples * *channels * 2 );
-			mlt_properties_set_double( properties, "meta.volume", 1.0 );
 		}
 		else if ( value != 1.0 )
 		{
@@ -408,8 +443,9 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
 				*p = *p * value;
 				p ++;
 			}
-			mlt_properties_set_double( properties, "meta.volume", 1.0 );
 		}
+
+		mlt_properties_set( properties, "meta.volume", NULL );
 	}
 
 	return 0;
@@ -602,81 +638,37 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int
 	return ret;
 }
 
-uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight )
+uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight, uint8_t alpha_value )
 {
 	uint8_t *output = NULL;
 
 	if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) )
 	{
-		iwidth = iwidth - ( iwidth % 2 );
-		owidth = owidth - ( owidth % 2 );
+		uint8_t *out_line;
+		int offset_x = ( owidth - iwidth ) / 2;
+		int offset_y = ( oheight - iheight ) / 2;
+		int iused = iwidth;
 
 		output = mlt_pool_alloc( owidth * oheight );
+		memset( output, alpha_value, owidth * oheight );
 
-   		// Coordinates (0,0 is middle of output)
-   		int y;
-
-   		// Calculate ranges
-   		int out_x_range = owidth / 2;
-   		int out_y_range = oheight / 2;
-   		int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
-   		int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
+		offset_x -= offset_x % 2;
 
-   		// Output pointers
-   		uint8_t *out_line = output;
-   		uint8_t *out_ptr = out_line;
-
-   		// Calculate a middle and possibly invalid pointer in the input
-   		uint8_t *in_middle = input + iwidth * ( iheight / 2 ) + ( iwidth / 2 );
-   		int in_line = - in_y_range * iwidth - in_x_range;
-
-		int elements;
-
-		// Fill whole section with black
-		y = out_y_range - ( iheight / 2 );
-		int blank_elements = owidth * y;
-		elements = blank_elements;
-		while ( elements -- )
-			*out_line ++ = 0;
-
-		int active_width = iwidth;
-		int inactive_width = out_x_range - in_x_range;
-		uint8_t *p = NULL;
-		uint8_t *end = NULL;
+		out_line = output + offset_y * owidth;
+		out_line += offset_x;
 
    		// Loop for the entirety of our output height.
 		while ( iheight -- )
    		{
-       		// Start at the beginning of the line
-       		out_ptr = out_line;
-
-			// Fill the outer part with black
-			elements = inactive_width;
-			while ( elements -- )
-				*out_ptr ++ = 0;
-
    			// We're in the input range for this row.
-			p = in_middle + in_line;
-			end = out_ptr + active_width;
-			while ( out_ptr != end )
-				*out_ptr ++ = *p ++;
-
-			// Fill the outer part with black
-			elements = inactive_width;
-			while ( elements -- )
-				*out_ptr ++ = 0;
-	
+			memcpy( out_line, input, iused );
+
   			// Move to next input line
-   			in_line += iwidth;
+   			input += iwidth;
 
        		// Move to next output line
        		out_line += owidth;
    		}
-
-		// Fill whole section with black
-		elements = blank_elements;
-		while ( elements -- )
-			*out_line ++ = 0;
 	}
 
 	return output;
@@ -687,12 +679,13 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 	// Calculate strides
 	int istride = iwidth * 2;
 	int ostride = owidth * 2;
+	int offset_x = ( owidth - iwidth );
+	int offset_y = ( oheight - iheight ) / 2;
+	uint8_t *in_line = input;
+	uint8_t *out_line;
+	int size = owidth * oheight;
+	uint8_t *p = output;
 
-	iwidth = iwidth - ( iwidth % 2 );
-	owidth = owidth - ( owidth % 2 );
-	//iheight = iheight - ( iheight % 2 );
-	//oheight = oheight - ( oheight % 2 );
-	
 	// Optimisation point
 	if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) )
 	{
@@ -704,93 +697,29 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 		return;
 	}
 
-   	// Coordinates (0,0 is middle of output)
-   	int y;
-
-   	// Calculate ranges
-   	int out_x_range = owidth / 2;
-   	int out_y_range = oheight / 2;
-   	int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
-   	int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
-
-   	// Output pointers
-   	uint8_t *out_line = output;
-   	uint8_t *out_ptr = out_line;
-
-   	// Calculate a middle and possibly invalid pointer in the input
-   	uint8_t *in_middle = input + istride * ( iheight / 2 ) + iwidth;
-   	int in_line = - in_y_range * istride - in_x_range * 2;
-
-	int elements;
-
-	// Fill whole section with black
-	y = out_y_range - ( iheight / 2 );
-	int blank_elements = ostride * y / 2;
-	elements = blank_elements;
-	while ( elements -- )
+	while( size -- )
 	{
-		*out_line ++ = 16;
-		*out_line ++ = 128;
+		*p ++ = 16;
+		*p ++ = 128;
 	}
 
-	int active_width = 2 * iwidth;
-	int left_inactive_width = out_x_range - in_x_range;
-	int right_inactive_width = left_inactive_width;
-	uint8_t *p = NULL;
-	uint8_t *end = NULL;
+	offset_x -= offset_x % 4;
 
-	if ( in_line % 4 )
-	{
-		active_width -= 2;
-		in_middle += 2;
-		right_inactive_width += 2;
-	}
+	out_line = output + offset_y * ostride;
+	out_line += offset_x;
 
    	// Loop for the entirety of our output height.
 	while ( iheight -- )
    	{
-       	// Start at the beginning of the line
-       	out_ptr = out_line;
-
-		// Fill the outer part with black
-		elements = left_inactive_width;
-		while ( elements -- )
-		{
-			*out_ptr ++ = 16;
-			*out_ptr ++ = 128;
-		}
-
    		// We're in the input range for this row.
-		p = in_middle + in_line;
-		end = out_ptr + active_width;
-		while ( out_ptr != end )
-		{
-			*out_ptr ++ = *p ++;
-			*out_ptr ++ = *p ++;
-		}
+		memcpy( out_line, in_line, iwidth * 2 );
 
-		// Fill the outer part with black
-		elements = right_inactive_width;
-		while ( elements -- )
-		{
-			*out_ptr ++ = 16;
-			*out_ptr ++ = 128;
-		}
-
-  		// Move to next input line
-   		in_line += istride;
+		// Move to next input line
+		in_line += istride;
 
-       	// Move to next output line
-       	out_line += ostride;
+   		// Move to next output line
+   		out_line += ostride;
    	}
-
-	// Fill whole section with black
-	elements = blank_elements;
-	while ( elements -- )
-	{
-		*out_line ++ = 16;
-		*out_line ++ = 128;
-	}
 }
 
 /** A resizing function for yuv422 frames - this does not rescale, but simply
@@ -812,6 +741,8 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 	// If width and height are correct, don't do anything
 	if ( iwidth != owidth || iheight != oheight )
 	{
+		uint8_t alpha_value = mlt_properties_get_int( properties, "resize_alpha" );
+
 		// Create the output image
 		uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
 
@@ -824,10 +755,10 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 		mlt_properties_set_int( properties, "height", oheight );
 
 		// We should resize the alpha too
-		alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight );
+		alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight, alpha_value );
 		if ( alpha != NULL )
 		{
-			mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL );
+			mlt_properties_set_data( properties, "alpha", alpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL );
 			this->get_alpha_mask = NULL;
 		}
 
@@ -941,8 +872,8 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo
 	int i, j;
 	double d = 0, s = 0;
 
-	mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
 	mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
+	mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
 
 	int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
 	mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
@@ -990,6 +921,7 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo
 	return ret;
 }
 
+/* Will this break when mlt_position is converted to double? -Zach */
 int mlt_sample_calculator( float fps, int frequency, int64_t position )
 {
 	int samples = 0;
@@ -1035,3 +967,32 @@ int mlt_sample_calculator( float fps, int frequency, int64_t position )
 
 	return samples;
 }
+
+int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t frame )
+{
+	int64_t samples = 0;
+
+	// TODO: Correct rules for NTSC and drop the * 100 hack
+	if ( ( int )( fps * 100 ) == 2997 )
+	{
+		samples = ( ( double )( frame * frequency ) / 30 );
+		switch( frequency )
+		{
+			case 48000:
+				samples += 2 * ( frame / 5 );
+				break;
+			case 44100:
+				samples += frame + ( frame / 2 ) - ( frame / 30 ) + ( frame / 300 );
+				break;
+			case 32000:
+				samples += ( 2 * frame ) - ( frame / 4 ) - ( frame / 29 );
+				break;
+		}
+	}
+	else if ( fps != 0 )
+	{
+		samples = ( ( frame * frequency ) / ( int )fps );
+	}
+
+	return samples;
+}