/*
* Copyright (c) 2007 Luca Barbato <lu_zero@gentoo.org>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- ** @file int_altivec.c
+ ** @file
** integer misc ops.
**/
-#include "libavcodec/dsputil.h"
+#include "config.h"
+#if HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
-#include "gcc_fixes.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
return u.score[3];
}
-static void add_int16_altivec(int16_t * v1, int16_t * v2, int order)
-{
- int i;
- register vec_s16 vec, *pv;
-
- for(i = 0; i < order; i += 8){
- pv = (vec_s16*)v2;
- vec = vec_perm(pv[0], pv[1], vec_lvsl(0, v2));
- vec_st(vec_add(vec_ld(0, v1), vec), 0, v1);
- v1 += 8;
- v2 += 8;
- }
-}
-
-static void sub_int16_altivec(int16_t * v1, int16_t * v2, int order)
-{
- int i;
- register vec_s16 vec, *pv;
-
- for(i = 0; i < order; i += 8){
- pv = (vec_s16*)v2;
- vec = vec_perm(pv[0], pv[1], vec_lvsl(0, v2));
- vec_st(vec_sub(vec_ld(0, v1), vec), 0, v1);
- v1 += 8;
- v2 += 8;
- }
-}
-
-static int32_t scalarproduct_int16_altivec(int16_t * v1, int16_t * v2, int order, const int shift)
+static int32_t scalarproduct_int16_altivec(const int16_t * v1, const int16_t * v2, int order, const int shift)
{
int i;
LOAD_ZERO;
register vec_s16 vec1, *pv;
register vec_s32 res = vec_splat_s32(0), t;
register vec_u32 shifts;
- DECLARE_ALIGNED_16(int32_t, ires);
+ int32_t ires;
shifts = zero_u32v;
if(shift & 0x10) shifts = vec_add(shifts, vec_sl(vec_splat_u32(0x08), vec_splat_u32(0x1)));
return ires;
}
+static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul)
+{
+ LOAD_ZERO;
+ vec_s16 *pv1 = (vec_s16*)v1;
+ vec_s16 *pv2 = (vec_s16*)v2;
+ vec_s16 *pv3 = (vec_s16*)v3;
+ register vec_s16 muls = {mul,mul,mul,mul,mul,mul,mul,mul};
+ register vec_s16 t0, t1, i0, i1;
+ register vec_s16 i2 = pv2[0], i3 = pv3[0];
+ register vec_s32 res = zero_s32v;
+ register vec_u8 align = vec_lvsl(0, v2);
+ int32_t ires;
+ order >>= 4;
+ do {
+ t0 = vec_perm(i2, pv2[1], align);
+ i2 = pv2[2];
+ t1 = vec_perm(pv2[1], i2, align);
+ i0 = pv1[0];
+ i1 = pv1[1];
+ res = vec_msum(t0, i0, res);
+ res = vec_msum(t1, i1, res);
+ t0 = vec_perm(i3, pv3[1], align);
+ i3 = pv3[2];
+ t1 = vec_perm(pv3[1], i3, align);
+ pv1[0] = vec_mladd(t0, muls, i0);
+ pv1[1] = vec_mladd(t1, muls, i1);
+ pv1 += 2;
+ pv2 += 2;
+ pv3 += 2;
+ } while(--order);
+ res = vec_splat(vec_sums(res, zero_s32v), 3);
+ vec_ste(res, 0, &ires);
+ return ires;
+}
+
void int_init_altivec(DSPContext* c, AVCodecContext *avctx)
{
c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec;
- c->add_int16 = add_int16_altivec;
- c->sub_int16 = sub_int16_altivec;
c->scalarproduct_int16 = scalarproduct_int16_altivec;
+ c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_altivec;
}