X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=57c53b80eebcc964a66b4c51748584658fd641bc;hb=eccf04749681f70957f34fdd6742224774e72d15;hp=5a866272b99b166214446298d16e81995e0bfb35;hpb=6d3859319652988fd5da6fe8aa6dab79804926dd;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 5a86627..57c53b8 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -92,12 +92,12 @@ int mlt_frame_is_test_card( mlt_frame this )
 	return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_image" );
 }
 
-/** Check if we have a way to derive something than test audio.
+/** Check if we have a way to derive something other than test audio.
 */
 
 int mlt_frame_is_test_audio( mlt_frame this )
 {
-	return this->get_audio == NULL || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_audio" );
+	return mlt_deque_count( this->stack_audio ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_audio" );
 }
 
 /** Get the aspect ratio of the frame.
@@ -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,25 +221,63 @@ mlt_deque mlt_frame_service_stack( mlt_frame this )
 	return this->stack_service;
 }
 
+/** 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
+	of a composite where the b frame completely obscures the a frame).
+
+	The image must be writable and the destructor for the image itself must be taken
+	care of on another frame and that frame cannot have a replace applied to it... 
+	Further it assumes that no alpha mask is in use.
+
+	For these reasons, it can only be used in a specific situation - when you have 
+	multiple tracks each with their own transition and these transitions are applied
+	in a strictly reversed order (ie: highest numbered [lowest track] is processed 
+	first).
+
+	More reliable approach - the cases should be detected during the process phase
+	and the upper tracks should simply not be invited to stack...
+*/
+
+void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format format, int width, int height )
+{
+	// Remove all items from the stack
+	while( mlt_deque_pop_back( this->stack_image ) ) ;
+
+	// Update the information 
+	mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", image, 0, NULL, NULL );
+	mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "width", width );
+	mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "height", height );
+	mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "format", format );
+	this->get_alpha_mask = NULL;
+}
+
+/** Get the image associated to the frame.
+*/
+
 int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
 	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" );
@@ -242,6 +296,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
@@ -260,9 +315,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 )
 		{
@@ -278,6 +334,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 );
@@ -308,25 +365,42 @@ 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 )
 {
+	mlt_get_audio get_audio = mlt_frame_pop_audio( this );
 	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 	int hide = mlt_properties_get_int( properties, "test_audio" );
 
-	if ( hide == 0 && this->get_audio != NULL )
+	if ( hide == 0 && get_audio != NULL )
 	{
 		mlt_position position = mlt_frame_get_position( this );
-		this->get_audio( this, buffer, format, frequency, channels, samples );
+		get_audio( this, buffer, format, frequency, channels, samples );
 		mlt_frame_set_position( this, position );
 	}
 	else if ( mlt_properties_get_data( properties, "audio", NULL ) )
@@ -904,8 +978,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 );
@@ -953,6 +1027,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;
@@ -998,3 +1073,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;
+}