Merge ../mlt++

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

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index d5c04beb0d6e876bb54139987c126ab7d097c85a..d4afa3509506cc3ae59f800a485af44fe6530aef 100644 (file)
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -18,8 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_avdeinterlace.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <string.h>
@@ -30,6 +29,9 @@
 
 #ifdef USE_MMX
 #include "mmx.h"
+#else
+#define MAX_NEG_CROP 1024
+extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP];
 #endif
 
 #ifdef USE_MMX
@@ -79,6 +81,10 @@
                     movd_r2m(mm1,dst[0]);
 #endif
 
+#if LIBAVUTIL_VERSION_INT < (50<<16)
+#define PIX_FMT_YUYV422 PIX_FMT_YUV422
+#endif
+
 /* filter parameters: [-1 4 2 4 -1] // 8 */
 static inline void deinterlace_line(uint8_t *dst, 
                             const uint8_t *lum_m4, const uint8_t *lum_m3, 
@@ -87,7 +93,7 @@ static inline void deinterlace_line(uint8_t *dst,
                             int size)
 {
 #ifndef USE_MMX
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
     int sum;
 
     for(;size > 0;size--) {
@@ -130,7 +136,7 @@ static inline void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, ui
                              int size)
 {
 #ifndef USE_MMX
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
     int sum;
 
     for(;size > 0;size--) {
@@ -235,14 +241,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) {
@@ -274,11 +280,11 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
        else {
       if (src == dst) {
           deinterlace_bottom_field_inplace(dst->data[0], dst->linesize[0],
-                               width, height);
+                               width<<1, height);
       } else {
           deinterlace_bottom_field(dst->data[0],dst->linesize[0],
                                       src->data[0], src->linesize[0],
-                                      width, height);
+                                      width<<1, height);
       }
        }
 
@@ -312,8 +318,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                // 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