X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=be21562d595f507b6f6ba91d4e8be9e2c23ecf91;hb=e25076bb729fbb4a35b095bc58f3facbcbe82ef5;hp=e3e4f3f4ae25146ecc444aca1fca25884a3346a5;hpb=9963a6c9ec5fc7cf01d0932151aec4bcf4cc409b;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index e3e4f3f..be21562 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -205,7 +205,11 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 	
 	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 )
 	{
@@ -229,8 +233,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 			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" );
 		}
 		else
 		{
@@ -309,10 +311,13 @@ uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
 int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
 	mlt_properties properties = mlt_frame_properties( this );
+	int hide = mlt_properties_get_int( properties, "test_audio" );
 
-	if ( this->get_audio != NULL )
+	if ( hide == 0 && this->get_audio != NULL )
 	{
+		mlt_position position = mlt_frame_get_position( this );
 		this->get_audio( this, buffer, format, frequency, channels, samples );
+		mlt_frame_set_position( this, position );
 	}
 	else if ( mlt_properties_get_data( properties, "audio", NULL ) )
 	{
@@ -396,6 +401,12 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h )
 	return bitmap;
 }
 
+mlt_producer mlt_frame_get_original_producer( mlt_frame this )
+{
+	if ( this != NULL )
+		return mlt_properties_get_data( mlt_frame_properties( this ), "_producer", NULL );
+	return NULL;
+}
 
 void mlt_frame_close( mlt_frame this )
 {