[xine-cvs] CVS: xine-lib/src/post/deinterlace/plugins double.c,1.1,1.2 greedy.c,1.1,1.2 greedy2frame.c,1.1,1.2 linear.c,1.1,1.2 linearblend.c,1.1,1.2 vfir.c,1.1,1.2 weave.c,1.1,1.2

[Robin K. <kom...@us...>]

Update of /cvsroot/xine/xine-lib/src/post/deinterlace/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv9375/src/post/deinterlace/plugins

Modified Files:
	double.c greedy.c greedy2frame.c linear.c linearblend.c vfir.c 
	weave.c 
Log Message:
Make deinterlacer plugin compile on Solaris. Remove defunct code from xine-utils.

Index: double.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/double.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- double.c	13 Jun 2003 01:48:10 -0000	1.1
+++ double.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -19,7 +19,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 #include "speedy.h"
 #include "deinterlace.h"
 

Index: greedy.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/greedy.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- greedy.c	13 Jun 2003 01:48:10 -0000	1.1
+++ greedy.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -20,7 +20,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

Index: greedy2frame.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/greedy2frame.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- greedy2frame.c	13 Jun 2003 01:48:10 -0000	1.1
+++ greedy2frame.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -20,7 +20,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

Index: linear.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/linear.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linear.c	13 Jun 2003 01:48:10 -0000	1.1
+++ linear.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -17,7 +17,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 #include "speedy.h"
 #include "deinterlace.h"
 

Index: linearblend.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/linearblend.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linearblend.c	13 Jun 2003 01:48:10 -0000	1.1
+++ linearblend.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -22,7 +22,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

Index: vfir.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/vfir.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vfir.c	13 Jun 2003 01:48:10 -0000	1.1
+++ vfir.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -22,7 +22,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -44,26 +48,7 @@
                               uint8_t *lum_m3, uint8_t *lum_m2,
                               uint8_t *lum_m1, uint8_t *lum, int size )
 {
-    /**
-     * C implementation.
-    int sum;
-
-    for(;size > 0;size--) {
-        sum = -lum_m4[0];
-        sum += lum_m3[0] << 2;
-        sum += lum_m2[0] << 1;
-        sum += lum_m1[0] << 2;
-        sum += -lum[0];
-        dst[0] = (sum + 4) >> 3; // This needs to be clipped at 0 and 255: cm[(sum + 4) >> 3];
-        lum_m4++;
-        lum_m3++;
-        lum_m2++;
-        lum_m1++;
-        lum++;
-        dst++;
-    }
-    */
-
+#ifdef ARCH_X86
     mmx_t rounder;
 
     rounder.uw[0]=4;
@@ -102,6 +87,24 @@
         dst+=4;
     }
     emms();
+#else
+    int sum;
+
+    for(;size > 0;size--) {
+        sum = -lum_m4[0];
+        sum += lum_m3[0] << 2;
+        sum += lum_m2[0] << 1;
+        sum += lum_m1[0] << 2;
+        sum += -lum[0];
+        dst[0] = (sum + 4) >> 3; // This needs to be clipped at 0 and 255: cm[(sum + 4) >> 3];
+        lum_m4++;
+        lum_m3++;
+        lum_m2++;
+        lum_m1++;
+        lum++;
+        dst++;
+    }
+#endif
 }
 
 
@@ -140,7 +143,11 @@
     "ffmpeg: Vertical Blend",
     "Vertical",
     1,
+#ifdef ARCH_X86
     MM_ACCEL_X86_MMXEXT,
+#else
+    0,
+#endif
     0,
     0,
     0,

Index: weave.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/plugins/weave.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- weave.c	13 Jun 2003 01:48:10 -0000	1.1
+++ weave.c	13 Jun 2003 23:05:35 -0000	1.2
@@ -19,7 +19,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
 #include "speedy.h"
 #include "deinterlace.h"