X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fxine%2Ffilter_deinterlace.c;h=8916647b144fba4e1432980a8ca7bfdc7e71d7cf;hb=833934cc90094c909078f709532e6fe6f8f13b60;hp=e4b851ceec972a01f2f26d9c4ca0e61b3ef41b25;hpb=2e4eb8e703760fb408f86152451aeaf425f6a579;p=melted

diff --git a/src/modules/xine/filter_deinterlace.c b/src/modules/xine/filter_deinterlace.c
index e4b851c..8916647 100644
--- a/src/modules/xine/filter_deinterlace.c
+++ b/src/modules/xine/filter_deinterlace.c
@@ -79,23 +79,32 @@ static void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc, int width, int height
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	int error = 0;
+	int deinterlace = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "consumer_deinterlace" );
 	
 	// Pop the service off the stack
 	mlt_filter filter = mlt_frame_pop_service( this );
 
+	// Determine if we need a writable version or not
+	if ( deinterlace && !writable )
+		 writable = !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" );
+
+	// Get the input image
+	error = mlt_frame_get_image( this, image, format, width, height, writable );
+
 	// Check that we want progressive and we aren't already progressive
-	if ( *format == mlt_image_yuv422 &&
-		 !mlt_properties_get_int( mlt_frame_properties( this ), "progressive" ) &&
-		 mlt_properties_get_int( mlt_frame_properties( this ), "consumer_deinterlace" ) )
+	if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL )
 	{
-		// Get the input image
-		error = mlt_frame_get_image( this, image, format, width, height, 1 );
-		
 		// Determine deinterlace method
-		char *method_str = mlt_properties_get( mlt_filter_properties( filter ), "method" );
+		char *method_str = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "method" );
 		int method = DEINTERLACE_LINEARBLEND;
+		char *frame_method_str = mlt_properties_get( MLT_FRAME_PROPERTIES( this ), "deinterlace_method" );
 		
-		if ( strcmp( method_str, "bob" ) == 0 )
+		if ( frame_method_str != NULL )
+			method_str = frame_method_str;
+		
+		if ( method_str == NULL )
+			method = DEINTERLACE_LINEARBLEND;
+		else if ( strcmp( method_str, "bob" ) == 0 )
 			method = DEINTERLACE_BOB;
 		else if ( strcmp( method_str, "weave" ) == 0 )
 			method = DEINTERLACE_BOB;
@@ -108,12 +117,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		deinterlace_yuv( *image, image, *width * 2, *height, method );
 		
 		// Make sure that others know the frame is deinterlaced
-		mlt_properties_set_int( mlt_frame_properties( this ), "progressive", 1 );
-	}
-	else
-	{
-		// Get the input image
-		error = mlt_frame_get_image( this, image, format, width, height, writable );
+		mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "progressive", 1 );
 	}
 
 	return error;
@@ -142,7 +146,7 @@ mlt_filter filter_deinterlace_init( void *arg )
 	if ( this != NULL )
 	{
 		this->process = deinterlace_process;
-		mlt_properties_set( mlt_filter_properties( this ), "method", arg == NULL ? "linearblend" : arg );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "method", arg );
 	}
 	return this;
 }