altivec jumbo patch by (Romain Dolbeau <dolbeaur at club-internet dot fr>)

Originally committed as revision 1448 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 14 insertions, 18 deletions

diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index ccd32c4e4d..70e79e21f1 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -21,10 +21,6 @@
 #include "../dsputil.h"
 #include "../mpegvideo.h"
 
-
-// Used when initializing constant vectors
-#define FOUR_INSTANCES(x) x,x,x,x
-
 // Swaps two variables (used for altivec registers)
 #define SWAP(a,b) \
 do { \
@@ -100,7 +96,7 @@ int dct_quantize_altivec(MpegEncContext* s,
     int lastNonZero;
     vector float row0, row1, row2, row3, row4, row5, row6, row7;
     vector float alt0, alt1, alt2, alt3, alt4, alt5, alt6, alt7;
-    const vector float zero = (vector float)(FOUR_INSTANCES(0.0f));
+    const vector float zero = (const vector float)(0.0f);
 
     // Load the data into the row/alt vectors
     {
@@ -144,18 +140,18 @@ int dct_quantize_altivec(MpegEncContext* s,
 		// in the vector local variables, as floats, which we'll use during the
 		// quantize step...
     {
-        const vector float vec_0_298631336 = (vector float)(FOUR_INSTANCES(0.298631336f));
-        const vector float vec_0_390180644 = (vector float)(FOUR_INSTANCES(-0.390180644f));
-        const vector float vec_0_541196100 = (vector float)(FOUR_INSTANCES(0.541196100f));
-        const vector float vec_0_765366865 = (vector float)(FOUR_INSTANCES(0.765366865f));
-        const vector float vec_0_899976223 = (vector float)(FOUR_INSTANCES(-0.899976223f));
-        const vector float vec_1_175875602 = (vector float)(FOUR_INSTANCES(1.175875602f));
-        const vector float vec_1_501321110 = (vector float)(FOUR_INSTANCES(1.501321110f));
-        const vector float vec_1_847759065 = (vector float)(FOUR_INSTANCES(-1.847759065f));
-        const vector float vec_1_961570560 = (vector float)(FOUR_INSTANCES(-1.961570560f));
-        const vector float vec_2_053119869 = (vector float)(FOUR_INSTANCES(2.053119869f));
-        const vector float vec_2_562915447 = (vector float)(FOUR_INSTANCES(-2.562915447f));
-        const vector float vec_3_072711026 = (vector float)(FOUR_INSTANCES(3.072711026f));
+        const vector float vec_0_298631336 = (vector float)(0.298631336f);
+        const vector float vec_0_390180644 = (vector float)(-0.390180644f);
+        const vector float vec_0_541196100 = (vector float)(0.541196100f);
+        const vector float vec_0_765366865 = (vector float)(0.765366865f);
+        const vector float vec_0_899976223 = (vector float)(-0.899976223f);
+        const vector float vec_1_175875602 = (vector float)(1.175875602f);
+        const vector float vec_1_501321110 = (vector float)(1.501321110f);
+        const vector float vec_1_847759065 = (vector float)(-1.847759065f);
+        const vector float vec_1_961570560 = (vector float)(-1.961570560f);
+        const vector float vec_2_053119869 = (vector float)(2.053119869f);
+        const vector float vec_2_562915447 = (vector float)(-2.562915447f);
+        const vector float vec_3_072711026 = (vector float)(3.072711026f);
 
 
         int whichPass, whichHalf;
@@ -309,7 +305,7 @@ int dct_quantize_altivec(MpegEncContext* s,
 				// rounding when we convert to int, instead of flooring.)
         {
             vector signed int biasInt;
-            const vector float negOneFloat = (vector float)(FOUR_INSTANCES(-1.0f));
+            const vector float negOneFloat = (vector float)(-1.0f);
             LOAD4(biasInt, biasAddr);
             bias = vec_ctf(biasInt, QUANT_BIAS_SHIFT);
             negBias = vec_madd(bias, negOneFloat, zero);