From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Wed, 7 Apr 2004 15:05:04 +0000 (+0000)
Subject: aspect ratio and test card woes
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=25f69a94909b67a20d84bc0503c954d0a491ca36;p=melted

aspect ratio and test card woes


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@270 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index dc7dfa1..b03f078 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -144,8 +144,7 @@ int mlt_consumer_start( mlt_consumer this )
 		if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL )
 		{
 			// Create a test card producer
-			// TODO: do we want to use fezzik here?
-			mlt_producer producer = mlt_factory_producer( "fezzik", test_card );
+			mlt_producer producer = mlt_factory_producer( NULL, test_card );
 
 			// Do we have a producer
 			if ( producer != NULL )
@@ -341,7 +340,6 @@ static void consumer_read_ahead_start( mlt_consumer this )
 	
 	// Create the read ahead 
 	pthread_create( &this->ahead_thread, &thread_attributes, consumer_read_ahead_thread, this );
-
 }
 
 static void consumer_read_ahead_stop( mlt_consumer this )
diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 1b147a6..dd89049 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -219,13 +219,17 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 		if ( test_frame != NULL )
 		{
 			mlt_properties test_properties = mlt_frame_properties( test_frame );
-			mlt_properties_pass( properties, test_properties, "" );
+			//mlt_properties_pass( test_properties, properties, "" );
+			mlt_properties_set( test_properties, "rescale.interp", "nearest" );
+			//mlt_properties_set( test_properties, "aspect_ratio", "1" );
+			//mlt_properties_set( test_properties, "consumer_aspect_ratio", "1" );
 			mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
 			mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
 			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( properties, "rescale.interps", "none" );
+			//mlt_properties_pass( properties, test_properties, "" );
+			mlt_properties_set( properties, "rescale.interp", "none" );
 			mlt_properties_set( properties, "scale", "off" );
 		}
 		else
diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index fa624d4..4b0f76b 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -537,7 +537,8 @@ void mlt_properties_dump( mlt_properties this, FILE *output )
 	property_list *list = this->private;
 	int i = 0;
 	for ( i = 0; i < list->count; i ++ )
-		fprintf( output, "%s=%s\n", list->name[ i ], mlt_properties_get( this, list->name[ i ] ) );
+		if ( mlt_properties_get( this, list->name[ i ] ) != NULL )
+			fprintf( output, "%s=%s\n", list->name[ i ], mlt_properties_get( this, list->name[ i ] ) );
 }
 
 /** Close the list.