diff_against_release.patch

linux下的MPEG1

+       ::"g"(xtex) ,"g"(ytex)
+        , "g"(c), "g"(s)
+        , "g"(&data->conv_motif[0][0]));
     
     for (x=info->screen.width;x--;)
     {
Index: goom_core.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/goom_core.c,v
retrieving revision 1.13
diff -u -p -r1.13 goom_core.c
--- goom_core.c	19 Jul 2005 18:10:30 -0000	1.13
+++ goom_core.c	27 Jul 2005 20:28:29 -0000
@@ -35,18 +35,18 @@
 #define TIME_BTW_CHG 300
 
 static void choose_a_goom_line (PluginInfo *goomInfo, float *param1, float *param2, int *couleur,
-                                int *mode, float *amplitude, int far);
+                                int *mode, float *amplitude, int isfar);
 
 static void update_message (PluginInfo *goomInfo, char *message);
 
 static void init_buffers(PluginInfo *goomInfo, int buffsize)
 {
     goomInfo->pixel = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
-    bzero (goomInfo->pixel, buffsize * sizeof (guint32) + 128);
+    memset (goomInfo->pixel, 0, buffsize * sizeof (guint32) + 128);
     goomInfo->back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
-    bzero (goomInfo->back, buffsize * sizeof (guint32) + 128);
+    memset (goomInfo->back, 0, buffsize * sizeof (guint32) + 128);
     goomInfo->conv = (Pixel *) malloc (buffsize * sizeof (guint32) + 128);
-    bzero (goomInfo->conv, buffsize * sizeof (guint32) + 128);
+    memset (goomInfo->conv, 0, buffsize * sizeof (guint32) + 128);
 
     goomInfo->outputBuf = goomInfo->conv;
     
@@ -780,13 +780,13 @@ void goom_close (PluginInfo *goomInfo)
 /* *** */
 void
 choose_a_goom_line (PluginInfo *goomInfo, float *param1, float *param2, int *couleur, int *mode,
-                    float *amplitude, int far)
+                    float *amplitude, int isfar)
 {
     *mode = goom_irand(goomInfo->gRandom,3);
     *amplitude = 1.0f;
     switch (*mode) {
         case GML_CIRCLE:
-            if (far) {
+            if (isfar) {
                 *param1 = *param2 = 0.47f;
                 *amplitude = 0.8f;
                 break;
@@ -804,7 +804,7 @@ choose_a_goom_line (PluginInfo *goomInfo
             }
             break;
         case GML_HLINE:
-            if (goom_irand(goomInfo->gRandom,4) || far) {
+            if (goom_irand(goomInfo->gRandom,4) || isfar) {
                 *param1 = goomInfo->screen.height / 7;
                 *param2 = 6.0f * goomInfo->screen.height / 7.0f;
             }
@@ -814,7 +814,7 @@ choose_a_goom_line (PluginInfo *goomInfo
             }
             break;
         case GML_VLINE:
-            if (goom_irand(goomInfo->gRandom,3) || far) {
+            if (goom_irand(goomInfo->gRandom,3) || isfar) {
                 *param1 = goomInfo->screen.width / 7.0f;
                 *param2 = 6.0f * goomInfo->screen.width / 7.0f;
             }
--- filters.c.orig	2005-08-20 12:29:12.000000000 +0200
+++ filters.c	2005-08-20 12:28:25.000000000 +0200
@@ -201,8 +201,8 @@ static inline v2g zoomVector(ZoomFilterF
     /* Noise */
     if (data->noisify)
     {
-        vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
-        vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+        vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+        vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
     }
     
     /* Hypercos */
diff -r -u xine-lib-1.1.0-orig/src/post/goom/convolve_fx.c xine-lib-1.1.0/src/post/goom/convolve_fx.c
--- convolve_fx.c	2005-07-22 12:42:00.000000000 -0400
+++ convolve_fx.c	2005-11-11 14:59:39.925112333 -0500
@@ -151,7 +155,8 @@
     ytex = yprime + yi + CONV_MOTIF_W * 0x10000 / 2;
     yprime += c;
 
-#ifdef HAVE_MMX
+#if defined(HAVE_MMX) && ! defined(ARCH_X86_64)
+/* This code uses 32-bit registers eax,ecx,esi */
     __asm__ __volatile__
       ("\n\t pxor  %%mm7,  %%mm7"  /* mm7 = 0   */
        "\n\t movd %0,  %%mm2"
diff -r -u xine-lib-1.1.0-orig/src/post/goom/mmx.c xine-lib-1.1.0/src/post/goom/mmx.c
--- mmx.c	2004-07-21 10:38:30.000000000 -0400
+++ mmx.c	2005-11-11 14:51:52.890358793 -0500
@@ -4,6 +4,7 @@
 #define BUFFPOINTMASK 0xffff
 #define BUFFINCR 0xff
 
+#include <stddef.h>
 #include "mmx.h"
 #include "goom_graphic.h"
 
@@ -23,6 +24,7 @@
 		      int precalCoef[16][16])
 {
 	unsigned int ax = (prevX-1)<<PERTEDEC, ay = (prevY-1)<<PERTEDEC;
+        size_t sizeX = prevX;
 
 	int bufsize = prevX * prevY;
 	int loop;
@@ -33,7 +35,7 @@
 	{
 		/*      int couleur; */
 		int px,py;
-		int pos;
+		size_t pos;
 		int coeffs;
 
 		int myPos = loop << 1,
@@ -91,7 +93,7 @@
 		"punpckhbw %%mm7, %%mm5 \n\t"	/* 00-c4-00-c4-00-c4-00-c4 */
 
 		/* ajouter la longueur de ligne a esi */
-		"addl 8(%%ebp),%1 \n\t"
+		"add %4,%1 \n\t"
 
 		/* recuperation des 2 derniers pixels */
 		"movq (%3,%1,4), %%mm1 \n\t"
@@ -114,8 +116,8 @@
 		"packuswb %%mm7, %%mm0 \n\t"
 
 		"movd %%mm0,%0 \n\t"
-		  :"=g"(expix2[loop])
-		  :"r"(pos),"r"(coeffs),"r"(expix1)
+		  :"=g"(expix2[loop]),"+r"(pos)
+		  :"r"(coeffs),"r"(expix1),"g"(sizeX)
 
 		);
 
diff -r -u xine-lib-1.1.0-orig/src/post/goom/mmx.h xine-lib-1.1.0/src/post/goom/mmx.h
--- mmx.h	2005-07-19 14:10:30.000000000 -0400
+++ mmx.h	2005-11-11 14:51:52.890358793 -0500
@@ -27,6 +27,10 @@
 #ifndef _MMX_H
 #define _MMX_H
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "goom_graphic.h"
 
 /*	Warning:  at this writing, the version of GAS packaged
@@ -69,6 +73,9 @@
 		 13 if AMD Extended MMX, &3dNow supported
 	   0 if hardware does not support any of these
 	*/
+#ifdef ARCH_X86_64
+	return 13;
+#else
 	register int rval = 0;
 
 	__asm__ __volatile__ (
@@ -223,6 +230,7 @@
 
 	/* Return */
 	return(rval);
+#endif
 }
 
 /*	Function to test if mmx instructions are supported...
diff -r -u xine-lib-1.1.0-orig/src/post/goom/xmmx.c xine-lib-1.1.0/src/post/goom/xmmx.c
--- xmmx.c	2005-07-21 16:48:37.000000000 -0400
+++ xmmx.c	2005-11-11 14:51:52.890358793 -0500
@@ -23,7 +23,12 @@
 #include "goom_graphic.h"
 
 int xmmx_supported (void) {
+#ifdef ARCH_X86_64
+	return 0; /* Haven't yet converted zoom_filter_xmmx 
+                     to support 64-bit memory index registers (rsi,rax) */
+#else
 	return (mm_support()&0x8)>>3;
+#endif
 }
 
 void zoom_filter_xmmx (int prevX, int prevY,
@@ -31,6 +36,7 @@
                        int *lbruS, int *lbruD, int buffratio,
                        int precalCoef[16][16])
 {
+#ifndef ARCH_X86_64
 	int bufsize = prevX * prevY; /* taille du buffer */
 	volatile int loop;                    /* variable de boucle */
 
@@ -244,6 +250,7 @@
 /*#else
 	emms();
 #endif*/
+#endif /* ARCH_X86_64 */
 }
 
 #define DRAWMETHOD_PLUS_XMMX(_out,_backbuf,_col) \
Index: goom_config.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/goom_config.h,v
retrieving revision 1.9
diff -u -p -r1.9 goom_config.h
--- goom_config.h	21 Nov 2004 15:10:40 -0000	1.9
+++ goom_config.h	8 Apr 2006 15:35:01 -0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #if WORDS_BIGENDIAN
 #define COLOR_ARGB
 #else
Index: gfontlib.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/gfontlib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfontlib.c	21 Jul 2004 14:38:29 -0000	1.4
+++ gfontlib.c	4 May 2006 20:50:55 -0000	1.5
@@ -1,5 +1,5 @@
 #include "goom_config.h"
-#include "gfontrle.h"
+#include "gfontrle.c"
 #include "gfontlib.h"
 #include <string.h>
 #include <stdlib.h>
Index: gfontrle.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/gfontrle.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gfontrle.c	4 May 2006 18:10:40 -0000	1.4
+++ gfontrle.c	4 May 2006 20:50:55 -0000	1.5
@@ -1,6 +1,6 @@
 /* RGBA C-Source image dump (with zRLE compression) */
 
-const struct {
+static const struct {
   unsigned int width;
   unsigned int height;
   unsigned int bytes_per_pixel;
--- gfontrle.h	Sun Jun 11 17:22:15 2006	1.2
+++ gfontrle.h	Sun Jun 11 17:22:15 2006
@@ -1,7 +0,0 @@
-extern const struct {
-	unsigned int width;
-	unsigned int height;
-	unsigned int bytes_per_pixel;
-	unsigned int rle_size;
-	unsigned char rle_pixel [49725];
-} the_font ;
Index: goomsl_heap.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/goomsl_heap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- goomsl_heap.c	19 Jul 2005 18:10:30 -0000	1.1
+++ goomsl_heap.c	7 Jun 2006 22:52:29 -0000	1.2
@@ -39,7 +39,7 @@ static void align_it(GoomHeap *_this, in
 {
   if ((alignment > 1) && (_this->number_of_arrays>0)) {
     void *last_array = _this->arrays[_this->number_of_arrays - 1];
-    int   last_address = (int)last_array + _this->consumed_in_last_array;
+    long  last_address = (long)last_array + _this->consumed_in_last_array;
     int   decal = (last_address % alignment);
     if (decal != 0) {
       _this->consumed_in_last_array += alignment - decal;
Index: mathtools.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/mathtools.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mathtools.c	27 Jun 2004 11:58:47 -0000	1.1
+++ mathtools.c	2 Jun 2006 22:13:45 -0000	1.2
@@ -8,9 +8,7 @@
 */
 /*---------------------------------------------------------------------------*/
 
-#include "mathtools.h"
-
-float sin256[256] = {
+static const float sin256[256] = {
   0,0.0245412,0.0490677,0.0735646,0.0980171,0.122411,0.14673,0.170962
   ,0.19509,0.219101,0.24298,0.266713,0.290285,0.313682,0.33689,0.359895
   ,0.382683,0.405241,0.427555,0.449611,0.471397,0.492898,0.514103,0.534998
@@ -46,7 +44,7 @@ float sin256[256] = {
 
 };
 
-float cos256[256] = {
+static const float cos256[256] = {
   0,0.999699,0.998795,0.99729,0.995185,0.99248,0.989177,0.985278
   ,0.980785,0.975702,0.970031,0.963776,0.95694,0.949528,0.941544,0.932993
   ,0.92388,0.91421,0.903989,0.893224,0.881921,0.870087,0.857729,0.844854
Index: mathtools.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/goom/mathtools.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mathtools.h	27 Jun 2004 11:58:47 -0000	1.2
+++ mathtools.h	2 Jun 2006 22:13:45 -0000	1.3
@@ -29,8 +29,7 @@
 #define SINCOS(f,s,c) {s=sin(f);c=cos(f);}
 #endif
 
-extern float sin256[256];
-extern float cos256[256];
+#include "mathtools.c"
 
 #endif