X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avdeinterlace.c;h=d4afa3509506cc3ae59f800a485af44fe6530aef;hb=bb2674a23b551cbc146d40ff7a122c87856b49ff;hp=b071f6efa072f3f965485310216f70593c006ba2;hpb=78cb03b80c9483db3f3c6bb44eb420da69ca60c0;p=melted

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index b071f6e..d4afa35 100644
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * 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