diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
commit | 5c7e9e16c961f1f7258734426afac3cee4349580 (patch) | |
tree | 20ea7bec723ef262bffb8f2447adcc1dc3d98069 /libavcodec/ppc | |
parent | 0e79fe37e5c5500db2e65ce6b7ea0bbdb3f24665 (diff) | |
parent | e034cc6c60c77dce390b1ac31141b1862bdf8999 (diff) | |
download | ffmpeg-streaming-5c7e9e16c961f1f7258734426afac3cee4349580.zip ffmpeg-streaming-5c7e9e16c961f1f7258734426afac3cee4349580.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Move vector_fmul_window to AVFloatDSPContext
rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r-- | libavcodec/ppc/float_altivec.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libavcodec/ppc/float_altivec.c b/libavcodec/ppc/float_altivec.c index e7b04ec..9d7dd8a 100644 --- a/libavcodec/ppc/float_altivec.c +++ b/libavcodec/ppc/float_altivec.c @@ -75,43 +75,8 @@ static void vector_fmul_add_altivec(float *dst, const float *src0, } } -static void vector_fmul_window_altivec(float *dst, const float *src0, const float *src1, const float *win, int len) -{ - vector float zero, t0, t1, s0, s1, wi, wj; - const vector unsigned char reverse = vcprm(3,2,1,0); - int i,j; - - dst += len; - win += len; - src0+= len; - - zero = (vector float)vec_splat_u32(0); - - for(i=-len*4, j=len*4-16; i<0; i+=16, j-=16) { - s0 = vec_ld(i, src0); - s1 = vec_ld(j, src1); - wi = vec_ld(i, win); - wj = vec_ld(j, win); - - s1 = vec_perm(s1, s1, reverse); - wj = vec_perm(wj, wj, reverse); - - t0 = vec_madd(s0, wj, zero); - t0 = vec_nmsub(s1, wi, t0); - t1 = vec_madd(s0, wi, zero); - t1 = vec_madd(s1, wj, t1); - t1 = vec_perm(t1, t1, reverse); - - vec_st(t0, i, dst); - vec_st(t1, j, dst); - } -} - 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; - if(!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->vector_fmul_window = vector_fmul_window_altivec; - } } |