From: Robin K. <kom...@us...> - 2004-02-20 20:05:06
|
Update of /cvsroot/xine/xine-lib/src/post/goom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27301/src/post/goom Modified Files: filters.c filters.h goom_core.c Log Message: Fixed detection of linux framebuffer support. Included xineutils.h in dsputil_mlib.c and added to diff_to_ffmpeg_cvs.txt. Fixed function prototype in dsputil_mlib.c (should be sent back to ffmpeg-dev at some point). Fixed includes in nosefart. Fixed nested comments and includes in goom. Index: filters.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/post/goom/filters.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- filters.c 19 Feb 2004 02:50:26 -0000 1.12 +++ filters.c 20 Feb 2004 19:53:39 -0000 1.13 @@ -12,13 +12,21 @@ //#define _DEBUG_PIXEL; +#include <stdlib.h> +#include <stdio.h> +#include <math.h> + +#if HAVE_INTTYPES_H +# include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif +#endif + #include "filters.h" #include "graphic.h" #include "goom_tools.h" -#include <stdlib.h> -#include <math.h> -#include <stdio.h> -#include <stdint.h> #ifdef HAVE_MMX #define USE_ASM @@ -726,7 +734,7 @@ } /* if (interlace_start>=0) { - /* creation de la nouvelle destination * + * creation de la nouvelle destination * for (y = interlace_start; y < prevY; y+=INTERLACE_INCR) { Uint premul_y_prevX = y * prevX * 2; for (x = 0; x < prevX; x++) { @@ -736,13 +744,13 @@ calculatePXandPY (x, y, &px, &py); - /* if (py>ay<<16) + * if (py>ay<<16) py = iRAND (32); if (px>ax<<16) px = iRAND (32); * - /* + * if ((px == x << 4) && (py == y << 4)) { if (x > middleX) py += 2; @@ -765,7 +773,6 @@ if (interlace_start == 0) interlace_start = -1; } - */ if (interlace_start>=0) { Index: filters.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/post/goom/filters.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- filters.h 15 Sep 2003 22:53:53 -0000 1.5 +++ filters.h 20 Feb 2004 19:53:39 -0000 1.6 @@ -8,22 +8,17 @@ typedef struct { - int vitesse; /* 128 = vitesse nule... * * 256 = en arriere - * hyper vite.. * * 0 = en avant hype vite. */ + int vitesse; /* 128 = vitesse nule... * * 256 = en arriere * hyper vite.. * * 0 = en avant hype vite. */ unsigned char pertedec; unsigned char sqrtperte; - int middleX, middleY; /* milieu de l'effet */ - char reverse; /* inverse la vitesse */ - char mode; /* type d'effet à appliquer (cf les #define) - * * * * * /** @since June 2001 */ - int hPlaneEffect; /* deviation horitontale */ - int vPlaneEffect; /* deviation verticale */ - /** @since April 2002 */ - int waveEffect; /* applique une "surcouche" de wave effect */ - int hypercosEffect; /* applique une "surcouche de hypercos effect - */ - - char noisify; /* ajoute un bruit a la transformation */ + int middleX, middleY; /* milieu de l'effet */ + char reverse; /* inverse la vitesse */ + char mode; /* type d'effet à appliquer (cf les #define) */ /** @since June 2001 */ + int hPlaneEffect; /* deviation horitontale */ + int vPlaneEffect; /* deviation verticale */ /** @since April 2002 */ + int waveEffect; /* applique une "surcouche" de wave effect */ + int hypercosEffect; /* applique une "surcouche de hypercos effect */ + char noisify; /* ajoute un bruit a la transformation */ } ZoomFilterData; Index: goom_core.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/post/goom/goom_core.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- goom_core.c 19 Feb 2004 02:50:26 -0000 1.9 +++ goom_core.c 20 Feb 2004 19:53:39 -0000 1.10 @@ -1,7 +1,15 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <stdint.h> + +#if HAVE_INTTYPES_H +# include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif +#endif + #include "goom_core.h" #include "goom_tools.h" #include "filters.h" |