Cleanup copyrights and attributions, and move Jean-Baptiste's services to a new kdenl...

[mlt] / src / modules / xine / filter_deinterlace.c

diff --git a/src/modules/xine/filter_deinterlace.c b/src/modules/xine/filter_deinterlace.c
index 9d122a974eeabbd4bd2f07da947ea754035f3212..ef69b8af0145df755b178ad55cb18163754b0e57 100644 (file)
--- a/src/modules/xine/filter_deinterlace.c
+++ b/src/modules/xine/filter_deinterlace.c
@@ -26,80 +26,37 @@
 #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" );
                int method = DEINTERLACE_LINEARBLEND;
+               char *frame_method_str = mlt_properties_get( MLT_FRAME_PROPERTIES( this ), "deinterlace_method" );
                
-               if ( method_str == NULL )
-                       method_str = mlt_properties_get( MLT_FRAME_PROPERTIES( this ), "deinterlace_method" );
+               if ( frame_method_str != NULL )
+                       method_str = frame_method_str;
                
                if ( method_str == NULL )
-                       mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "method", "linearblend" );
+                       method = DEINTERLACE_LINEARBLEND;
                else if ( strcmp( method_str, "bob" ) == 0 )
                        method = DEINTERLACE_BOB;
                else if ( strcmp( method_str, "weave" ) == 0 )
@@ -115,11 +72,6 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                // 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 );
-       }
 
        return error;
 }