[FFmpeg-cvslog] ppc: remove shift parameter from scalarproduct_int16_altivec()

Mans Rullgard git at videolan.org
Tue May 1 22:19:18 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Fri Apr 27 10:39:58 2012 +0100| [ce82dad7eb66b641ac41cc40deec782227fd4bde] | committer: Mans Rullgard

ppc: remove shift parameter from scalarproduct_int16_altivec()

The shift parameter was removed from this interface in 7e1ce6a.
This updates the Altivec implementation to match.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce82dad7eb66b641ac41cc40deec782227fd4bde
---

 libavcodec/ppc/int_altivec.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c
index b94b636..bbf4e1d 100644
--- a/libavcodec/ppc/int_altivec.c
+++ b/libavcodec/ppc/int_altivec.c
@@ -80,27 +80,18 @@ static int ssd_int8_vs_int16_altivec(const int8_t *pix1, const int16_t *pix2,
 }
 
 static int32_t scalarproduct_int16_altivec(int16_t *v1, const int16_t *v2,
-                                           int order, const int shift)
+                                           int order)
 {
     int i;
     LOAD_ZERO;
     register vec_s16 vec1, *pv;
     register vec_s32 res = vec_splat_s32(0), t;
-    register vec_u32 shifts;
     int32_t ires;
 
-    shifts = zero_u32v;
-    if(shift & 0x10) shifts = vec_add(shifts, vec_sl(vec_splat_u32(0x08), vec_splat_u32(0x1)));
-    if(shift & 0x08) shifts = vec_add(shifts, vec_splat_u32(0x08));
-    if(shift & 0x04) shifts = vec_add(shifts, vec_splat_u32(0x04));
-    if(shift & 0x02) shifts = vec_add(shifts, vec_splat_u32(0x02));
-    if(shift & 0x01) shifts = vec_add(shifts, vec_splat_u32(0x01));
-
     for(i = 0; i < order; i += 8){
         pv = (vec_s16*)v1;
         vec1 = vec_perm(pv[0], pv[1], vec_lvsl(0, v1));
         t = vec_msum(vec1, vec_ld(0, v2), zero_s32v);
-        t = vec_sr(t, shifts);
         res = vec_sums(t, res);
         v1 += 8;
         v2 += 8;



More information about the ffmpeg-cvslog mailing list