diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 13:54:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 13:54:34 +0100 |
commit | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (patch) | |
tree | bcbe435fd95a2b06c8526617a2959fe0f6b8c637 /libavcodec/ppc | |
parent | 205b2d2a9822e163cb24a2531d4b50e82e64eae4 (diff) | |
parent | 55aa03b9f8f11ebb7535424cc0e5635558590f49 (diff) | |
download | ffmpeg-streaming-b1b870fbd7185bffbe27c5918001b40a8ff8b920.zip ffmpeg-streaming-b1b870fbd7185bffbe27c5918001b40a8ff8b920.tar.gz |
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r-- | libavcodec/ppc/float_altivec.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/ppc/float_altivec.c b/libavcodec/ppc/float_altivec.c index 9d7dd8a..2c6814a 100644 --- a/libavcodec/ppc/float_altivec.c +++ b/libavcodec/ppc/float_altivec.c @@ -51,32 +51,7 @@ static void vector_fmul_reverse_altivec(float *dst, const float *src0, } } -static void vector_fmul_add_altivec(float *dst, const float *src0, - const float *src1, const float *src2, - int len) -{ - int i; - vector float d, s0, s1, s2, t0, t1, edges; - vector unsigned char align = vec_lvsr(0,dst), - mask = vec_lvsl(0, dst); - - for (i=0; i<len-3; i+=4) { - t0 = vec_ld(0, dst+i); - t1 = vec_ld(15, dst+i); - s0 = vec_ld(0, src0+i); - s1 = vec_ld(0, src1+i); - s2 = vec_ld(0, src2+i); - edges = vec_perm(t1 ,t0, mask); - d = vec_madd(s0,s1,s2); - t1 = vec_perm(d, edges, align); - t0 = vec_perm(edges, d, align); - vec_st(t1, 15, dst+i); - vec_st(t0, 0, dst+i); - } -} - void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx) { c->vector_fmul_reverse = vector_fmul_reverse_altivec; - c->vector_fmul_add = vector_fmul_add_altivec; } |