ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/ppc/mpegvideo_altivec.c

 /*
  * Copyright (c) 2002 Dieter Shirley
  *
  * dct_unquantize_h263_altivec:
  * Copyright (c) 2003 Romain Dolbeau <romain@dolbeau.org>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 11 matching lines @@
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 
 #include "dsputil_ppc.h"
 #include "util_altivec.h"
 #include "types_altivec.h"
+#include "dsputil_altivec.h"
 
 // Swaps two variables (used for altivec registers)
 #define SWAP(a,b) \
 do { \
     __typeof__(a) swap_temp=a; \
     a=b; \
     b=swap_temp; \
 } while (0)
 
 // transposes a matrix consisting of four vectors with four elements each
@@ skipping 19 matching lines @@
     __typeof__(vec)* _load_addr = (__typeof__(vec)*)(address);  \
     vector unsigned char _perm_vec = vec_lvsl(0,(address));     \
     vec = vec_ld(0, _load_addr);                                \
     vec = vec_perm(vec, vec, _perm_vec);                        \
     vec = vec_splat(vec, 0);                                    \
 }
 
 
 #define FOUROF(a) {a,a,a,a}
 
-int dct_quantize_altivec(MpegEncContext* s,
+static int dct_quantize_altivec(MpegEncContext* s,
                          DCTELEM* data, int n,
                          int qscale, int* overflow)
 {
     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 = (const vector float)FOUROF(0.);
     // used after quantize step
     int oldBaseValue = 0;
 
@@ skipping 386 matching lines @@
         (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM)) {
         ff_block_permute(data, s->dsp.idct_permutation,
                 s->intra_scantable.scantable, lastNonZero);
     }
 
     return lastNonZero;
 }
 
 /* AltiVec version of dct_unquantize_h263
    this code assumes `block' is 16 bytes-aligned */
-void dct_unquantize_h263_altivec(MpegEncContext *s,
+static void dct_unquantize_h263_altivec(MpegEncContext *s,
                                  DCTELEM *block, int n, int qscale)
 {
 POWERPC_PERF_DECLARE(altivec_dct_unquantize_h263_num, 1);
     int i, level, qmul, qadd;
     int nCoeffs;
 
     assert(s->block_last_index[n]>=0);
 
 POWERPC_PERF_START_COUNT(altivec_dct_unquantize_h263_num, 1);
 
@@ skipping 10 matching lines @@
             qadd = 0;
         i = 1;
         nCoeffs= 63; //does not always use zigzag table
     } else {
         i = 0;
         nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ];
     }
 
     {
         register const vector signed short vczero = (const vector signed short)vec_splat_s16(0);
-        DECLARE_ALIGNED_16(short, qmul8) = qmul;
-        DECLARE_ALIGNED_16(short, qadd8) = qadd;
+        DECLARE_ALIGNED(16, short, qmul8) = qmul;
+        DECLARE_ALIGNED(16, short, qadd8) = qadd;
         register vector signed short blockv, qmulv, qaddv, nqaddv, temp1;
         register vector bool short blockv_null, blockv_neg;
         register short backup_0 = block[0];
         register int j = 0;
 
         qmulv = vec_splat((vec_s16)vec_lde(0, &qmul8), 0);
         qaddv = vec_splat((vec_s16)vec_lde(0, &qadd8), 0);
         nqaddv = vec_sub(vczero, qaddv);
 
 #if 0   // block *is* 16 bytes-aligned, it seems.
@@ skipping 44 matching lines @@
 
         if (i == 1) {
             // cheat. this avoid special-casing the first iteration
             block[0] = backup_0;
         }
     }
 POWERPC_PERF_STOP_COUNT(altivec_dct_unquantize_h263_num, nCoeffs == 63);
 }
 
 
-void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block);
-void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
-
 void MPV_common_init_altivec(MpegEncContext *s)
 {
     if ((mm_flags & FF_MM_ALTIVEC) == 0) return;
 
     if (s->avctx->lowres==0) {
         if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
             (s->avctx->idct_algo == FF_IDCT_ALTIVEC)) {
             s->dsp.idct_put = idct_put_altivec;
             s->dsp.idct_add = idct_add_altivec;
             s->dsp.idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
@@ skipping 17 matching lines @@
 
     if ((s->avctx->dct_algo == FF_DCT_AUTO) ||
             (s->avctx->dct_algo == FF_DCT_ALTIVEC)) {
 #if 0 /* seems to cause trouble under some circumstances */
         s->dct_quantize = dct_quantize_altivec;
 #endif
         s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
         s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
     }
 }