fix samples number calculation for 24 and 32 bit output

[mlt] / src / modules / avformat / filter_avdeinterlace.c

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index 8dd56367d7f49e4df5959d54dd9aa1a1105148b2..b4cf0eab78f3dfaf98d486be9da11e9115600538 100644 (file)
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -25,13 +25,13 @@
 #include <stdlib.h>
 
 // ffmpeg Header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
 
 #ifdef USE_MMX
 #include "mmx.h"
 #else
 #define MAX_NEG_CROP 1024
-extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP];
+static uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0,};
 #endif
 
 #ifdef USE_MMX
@@ -237,14 +237,14 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
 
     if (pix_fmt != PIX_FMT_YUV420P &&
         pix_fmt != PIX_FMT_YUV422P &&
-        pix_fmt != PIX_FMT_YUV422 &&
+        pix_fmt != PIX_FMT_YUYV422 &&
         pix_fmt != PIX_FMT_YUV444P &&
        pix_fmt != PIX_FMT_YUV411P)
         return -1;
     if ((width & 3) != 0 || (height & 3) != 0)
         return -1;
 
-       if ( pix_fmt != PIX_FMT_YUV422 )
+       if ( pix_fmt != PIX_FMT_YUYV422 )
        {
       for(i=0;i<3;i++) {
           if (i == 1) {
@@ -293,36 +293,34 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
 /** Do it :-).
 */
 
-static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+static int filter_get_image( mlt_frame frame, 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" );
+       int deinterlace = mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "consumer_deinterlace" );
 
        // Determine if we need a writable version or not
        if ( deinterlace && !writable )
-                writable = !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" );
+                writable = !mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "progressive" );
 
        // Get the input image
-       error = mlt_frame_get_image( this, image, format, width, height, writable );
+       *format = mlt_image_yuv422;
+       error = mlt_frame_get_image( frame, image, format, width, height, 1 );
 
        // Check that we want progressive and we aren't already progressive
-       if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) )
+       if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "progressive" ) )
        {
                // Create a picture
                AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) );
 
                // Fill the picture
-               if ( *format == mlt_image_yuv422 )
-               {
-                       avpicture_fill( output, *image, PIX_FMT_YUV422, *width, *height );
-                       mlt_avpicture_deinterlace( output, output, PIX_FMT_YUV422, *width, *height );
-               }
+               avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height );
+               mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
 
                // Free the picture
                mlt_pool_release( output );
 
                // Make sure that others know the frame is deinterlaced
-               mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "progressive", 1 );
+               mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "progressive", 1 );
        }
 
        return error;
@@ -331,7 +329,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 /** Deinterlace filter processing - this should be lazy evaluation here...
 */
 
-static mlt_frame deinterlace_process( mlt_filter this, mlt_frame frame )
+static mlt_frame deinterlace_process( mlt_filter filter, mlt_frame frame )
 {
        // Push the get_image method on to the stack
        mlt_frame_push_get_image( frame, filter_get_image );
@@ -344,9 +342,20 @@ static mlt_frame deinterlace_process( mlt_filter this, mlt_frame frame )
 
 mlt_filter filter_avdeinterlace_init( void *arg )
 {
-       mlt_filter this = mlt_filter_new( );
-       if ( this != NULL )
-               this->process = deinterlace_process;
-       return this;
+#ifndef USE_MMX
+       if ( ff_cropTbl[MAX_NEG_CROP + 1] == 0 )
+       {
+               int i;
+               for(i=0;i<256;i++) ff_cropTbl[i + MAX_NEG_CROP] = i;
+               for(i=0;i<MAX_NEG_CROP;i++) {
+                       ff_cropTbl[i] = 0;
+                       ff_cropTbl[i + MAX_NEG_CROP + 256] = 255;
+               }
+       }
+#endif
+       mlt_filter filter = mlt_filter_new( );
+       if ( filter != NULL )
+               filter->process = deinterlace_process;
+       return filter;
 }