File MPlayer-1.0pre7-gcc4-altivec.patch of Package MPlayer

File MPlayer-1.0pre7-gcc4-altivec.patch of Package MPlayer (Revision f565db2434ee02a2389a26c7f4a16fea)

Currently displaying revision f565db2434ee02a2389a26c7f4a16fea, show latest

--- configure
+++ configure
@@ -1306,6 +1306,9 @@
 		*) ;;
 	    esac
 	fi
+	if test -n "`$_cpuinfo | grep Power4`"; then
+	    _altivec=yes
+	fi
     fi
 
     if test -n "$_mcpu"; then
--- liba52/resample_altivec.c
+++ liba52/resample_altivec.c
@@ -18,7 +18,7 @@
 }
 
 static int a52_resample_STEREO_to_2_altivec(float * _f, int16_t * s16){
-#if 0
+ if ((intptr_t) _f & 15 || (intptr_t) s16 & 15) {
   int i;
   int32_t * f = (int32_t *) _f;
   for (i = 0; i < 256; i++) {
@@ -26,7 +26,7 @@
     s16[2*i+1] = convert (f[i+256]);
   }
   return 2*256;
-#else
+ } else {
   int i = 0;
   int32_t * f = (int32_t *) _f;
   register vector signed int f0, f4, f256, f260;
@@ -52,7 +52,7 @@
     s16 += 16;
   }
   return(2*256);
-#endif
+ }
 }
 
 static void* a52_resample_altivec(int flags, int ch){
--- libavcodec/ppc/fdct_altivec.c
+++ libavcodec/ppc/fdct_altivec.c
@@ -32,6 +32,11 @@
 #define vu16(v) ((vector unsigned short)(v))
 #define vu32(v) ((vector unsigned int)(v))
 
+#define vs16l(v) (*(vector signed short *)&(v))
+#define vs32l(v) (*(vector signed int *)&(v))
+#define vu8l(v)  (*(vector unsigned char *)&(v))
+#define vu16l(v) (*(vector unsigned short *)&(v))
+#define vu32l(v) (*(vector unsigned int *)&(v))
 
 #define C1     0.98078525066375732421875000 /* cos(1*PI/16) */
 #define C2     0.92387950420379638671875000 /* cos(2*PI/16) */
--- libswscale/yuv2rgb.c
+++ libswscale/yuv2rgb.c
@@ -37,6 +37,9 @@
 
 #include "config.h"
 #include "rgb2rgb.h"
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
 #include "swscale.h"
 #include "swscale_internal.h"

@@ -652,7 +652,7 @@
 #ifdef HAVE_ALTIVEC
     if (c->flags & SWS_CPU_CAPS_ALTIVEC)
     {
-        SwsFunc t = yuv2rgb_init_altivec(c);
+        extern SwsFunc yuv2rgb_init_altivec(SwsContext *);
         if (t) return t;
     }
 #endif
--- libswscale/yuv2rgb_altivec.c
+++ libswscale/yuv2rgb_altivec.c
@@ -90,6 +90,9 @@
 #include <malloc.h>
 #endif
 #include "rgb2rgb.h"
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
 #include "swscale.h"
 #include "swscale_internal.h"
 
--- libvo/vo_x11.c
+++ libvo/vo_x11.c
@@ -38,6 +38,10 @@
 #include "fastmemcpy.h"
 #include "sub.h"
 
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
+
 #include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 #define MODE_RGB  0x1