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

diff --git a/src/modules/xine/filter_deinterlace.c b/src/modules/xine/filter_deinterlace.c
index e4b851c..01871cf 100644
--- a/src/modules/xine/filter_deinterlace.c
+++ b/src/modules/xine/filter_deinterlace.c
@@ -18,7 +18,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "filter_deinterlace.h"
+#include <framework/mlt_filter.h>
 #include "deinterlace.h"
 
 #include <framework/mlt_frame.h>
@@ -26,76 +26,38 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Linear Blend filter - C version contributed by Rogerio Brito.
-   This algorithm has the same interface as the other functions.
-
-   The destination "screen" (pdst) is constructed from the source
-   screen (psrc[0]) line by line.
-
-   The i-th line of the destination screen is the average of 3 lines
-   from the source screen: the (i-1)-th, i-th and (i+1)-th lines, with
-   the i-th line having weight 2 in the computation.
-
-   Remarks:
-   * each line on pdst doesn't depend on previous lines;
-   * due to the way the algorithm is defined, the first & last lines of the
-     screen aren't deinterlaced.
-
-*/
-#if 0
-static void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc, int width, int height )
-{
-	register int x, y;
-	register uint8_t *l0, *l1, *l2, *l3;
-
-	l0 = pdst;			// target line
-	l1 = psrc;			// 1st source line
-	l2 = l1 + width;	// 2nd source line = line that follows l1
-	l3 = l2 + width;	// 3rd source line = line that follows l2
-
-	// Copy the first line
-	memcpy(l0, l1, width);
-	l0 += width;
-
-	for (y = 1; y < height-1; ++y) 
-	{
-		// computes avg of: l1 + 2*l2 + l3
-		for (x = 0; x < width; ++x)
-			l0[x] = (l1[x] + (l2[x]<<1) + l3[x]) >> 2;
-
-		// updates the line pointers
-		l1 = l2; l2 = l3; l3 += width;
-		l0 += width;
-	}
-
-	// Copy the last line
-	memcpy(l0, l1, width);
-}
-#endif
-
 /** Do it :-).
 */
 
 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 && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) )
 	{
-		// 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 ( frame_method_str != NULL )
+			method_str = frame_method_str;
 		
-		if ( strcmp( method_str, "bob" ) == 0 )
+		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 +70,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;
@@ -136,13 +93,13 @@ static mlt_frame deinterlace_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_deinterlace_init( void *arg )
+mlt_filter filter_deinterlace_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	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;
 }