X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=e61db675c3252f02988b202e936ca526e298d564;hb=0486280ed87912e4ee9c1103c8ace19fa322a4af;hp=fc67de8f2a395f18b70cf85e3ae802e4ee3f27a5;hpb=80761e7906f1694821044eefb3164b7f07c776e2;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index fc67de8..e61db67 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -200,10 +200,16 @@ 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 );
+
+	*width = *width >> 1 << 1;
 	
 	if ( get_image != NULL )
 	{
-		return get_image( this, buffer, format, width, height, writable );
+		int error = 0;
+		mlt_position position = mlt_frame_get_position( this );
+	   	error = get_image( this, buffer, format, width, height, writable );
+		mlt_frame_set_position( this, position );
+		return error;
 	}
 	else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
 	{
@@ -226,6 +232,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_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
 			mlt_properties_set( properties, "rescale.interp", "none" );
 			mlt_properties_set( properties, "scale", "off" );
 		}
@@ -339,13 +346,14 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
 	return 0;
 }
 
-unsigned char *mlt_frame_get_waveform( mlt_frame this, double fps, int w, int h )
+unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h )
 {
 	int16_t *pcm = NULL;
 	mlt_properties properties = mlt_frame_properties( this );
 	mlt_audio_format format = mlt_audio_pcm;
 	int frequency = 32000; // lower frequency available?
 	int channels = 2;
+	double fps = mlt_properties_get_double( properties, "fps" );
 	int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
 	
 	// Get the pcm data
@@ -369,10 +377,11 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, double fps, int w, int h
 		// pcm data has channels interleaved
 		for ( j = 0; j < channels; j++ )
 		{
-			// The height of a line is the ratio of the sample multiplied by 
+			// Determine sample's magnitude from 2s complement;
+			int pcm_magnitude = *pcm < 0 ? ~(*pcm) + 1 : *pcm;
+			// The height of a line is the ratio of the magnitude multiplied by 
 			// half the vertical resolution
-			int pcm_scaled = ( int )( ( double )( *pcm ) / 32768 * h / 2 );
-			int height = pcm_scaled < 0 ? -pcm_scaled : pcm_scaled;
+			int height = ( int )( ( double )( pcm_magnitude ) / 32768 * h / 2 );
 			// Determine the starting y coordinate - left channel above center,
 			// right channel below - currently assumes 2 channels
 			int displacement = ( h / 2 ) - ( 1 - j ) * height;