X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fkdenlive%2Fproducer_framebuffer.c;h=97edd6dca922e63e8599f32139c0f83ffc937ea3;hb=f4bdbe56053cc8debfdb74583977d74323a8ad0d;hp=bb25ae3fcf1c3133dac84dbd3af651d1b3a6b3cc;hpb=d33f444d4ef4c7bc4074d07a49eca0ab7d108394;p=melted

diff --git a/src/modules/kdenlive/producer_framebuffer.c b/src/modules/kdenlive/producer_framebuffer.c
index bb25ae3..97edd6d 100644
--- a/src/modules/kdenlive/producer_framebuffer.c
+++ b/src/modules/kdenlive/producer_framebuffer.c
@@ -82,6 +82,11 @@ static int framebuffer_get_image( mlt_frame this, uint8_t **image, mlt_image_for
 
 	if( first_image == NULL )
 	{
+		mlt_properties props = MLT_FRAME_PROPERTIES( this );
+		mlt_properties test_properties = MLT_FRAME_PROPERTIES( first_frame );
+		mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( props, "consumer_aspect_ratio" ) );
+		mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( props, "rescale.interp" ) );
+
 		error = mlt_frame_get_image( first_frame, &first_image, format, width, height, writable );
 
 		if( error != 0 ) {
@@ -166,10 +171,6 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
 
 			// Get the frame
 			mlt_service_get_frame( MLT_PRODUCER_SERVICE( real_producer ), &first_frame, index );
-
-			double ratio = mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( real_producer ), "aspect_ratio" ) * (double) mlt_properties_get_int( MLT_FRAME_PROPERTIES( first_frame ), "width" ) / (double) mlt_properties_get_int( MLT_FRAME_PROPERTIES( first_frame ), "height" ) / ( (double) mlt_properties_get_int(MLT_FRAME_PROPERTIES( *frame ), "width" ) / (double) mlt_properties_get_int( MLT_FRAME_PROPERTIES( *frame ), "height" ));
-
-			mlt_properties_set_double( properties, "ratio_fix", ratio );
 		}
 
 		// Make sure things are in their place
@@ -185,7 +186,6 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
 
 		// Give the returned frame temporal identity
 		mlt_frame_set_position( *frame, mlt_producer_position( this ) );
-		mlt_properties_set_double( MLT_FRAME_PROPERTIES(*frame), "aspect_ratio", mlt_properties_get_double( properties, "ratio_fix" ));
 	}
 
 	return 0;
@@ -194,7 +194,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
 
 mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
-
+	if ( !arg ) return NULL;
 	mlt_producer this = NULL;
 	this = calloc( 1, sizeof( struct mlt_producer_s ) );
 	mlt_producer_init( this, NULL );
@@ -205,8 +205,8 @@ mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type ty
 	// Check if a speed was specified.
 	/** 
 
-	* Speed must be appended to the filename with ':'. To play your video at 50%:
-	 inigo framebuffer:my_video.mpg:0.5
+	* Speed must be appended to the filename with '?'. To play your video at 50%:
+	 inigo framebuffer:my_video.mpg?0.5
 
 	* Stroboscope effect can be obtained by adding a stobe=x parameter, where
 	 x is the number of frames that will be ignored.
@@ -218,25 +218,23 @@ mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type ty
 
 	**/
 
-	double speed;
-
-	int count;
+	double speed = 0.0;
 	char *props = strdup( arg );
-	char *ptr = props;
-	count = strcspn( ptr, ":" );
-	ptr[count] = '\0';
-
+	char *ptr = strrchr( props, '?' );
+	
+	if ( ptr )
+	{
+		speed = atof( ptr + 1 );
+		if ( speed != 0.0 )
+			// If speed was valid, then strip it and the delimiter.
+			// Otherwise, an invalid speed probably means this '?' was not a delimiter.
+			*ptr = '\0';
+	}
+		
 	real_producer = mlt_factory_producer( profile, "fezzik", props );
-
-	ptr += count + 1;
-	ptr += strspn( ptr, ":" );
-	count = strcspn( ptr, ":" );
-	ptr[count] = '\0';
-	speed = atof(ptr);
 	free( props );
-	
-	if (speed == 0.0) speed = 1.0;
 
+	if (speed == 0.0) speed = 1.0;
 
 	if ( this != NULL && real_producer != NULL)
 	{
@@ -245,12 +243,13 @@ mlt_producer producer_framebuffer_init( mlt_profile profile, mlt_service_type ty
 
 		// Fezzik normalised it for us already
 		mlt_properties_set_int( properties, "fezzik_normalised", 1);
+		mlt_properties_set( properties, "resource", arg);
 
 		// Store the producer and fitler
 		mlt_properties_set_data( properties, "producer", real_producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
 
 		// Grab some stuff from the real_producer
-		mlt_properties_pass_list( properties, MLT_PRODUCER_PROPERTIES( real_producer ), "length,resource,width,height" );
+		mlt_properties_pass_list( properties, MLT_PRODUCER_PROPERTIES( real_producer ), "length, width,height" );
 
 
 		if ( speed != 1.0 )