mirror of https://github.com/FFmpeg/FFmpeg.git
Now, nellymoserenc and aacenc no longer depends on dsputil. Independent of this patch, wmaprodec also does not depend on dsputil, so I removed it from there also.pull/28/head^2
Ronald S. Bultje
12 years ago
parent
55aa03b9f8
commit
42d3246948
32 changed files with 231 additions and 310 deletions
@ -1,30 +0,0 @@ |
|||||||
/*
|
|
||||||
* Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net> |
|
||||||
* |
|
||||||
* This file is part of Libav. |
|
||||||
* |
|
||||||
* 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. |
|
||||||
* |
|
||||||
* 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 Libav; if not, write to the Free Software |
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
||||||
*/ |
|
||||||
|
|
||||||
#include "libavcodec/dsputil.h" |
|
||||||
#include "dsputil_arm.h" |
|
||||||
|
|
||||||
void ff_vector_fmul_reverse_vfp(float *dst, const float *src0, |
|
||||||
const float *src1, int len); |
|
||||||
|
|
||||||
void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx) |
|
||||||
{ |
|
||||||
c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp; |
|
||||||
} |
|
||||||
@ -1,106 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
|
|
||||||
* |
|
||||||
* This file is part of Libav. |
|
||||||
* |
|
||||||
* 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. |
|
||||||
* |
|
||||||
* 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 Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
||||||
*/ |
|
||||||
|
|
||||||
#include "config.h" |
|
||||||
#include "libavutil/arm/asm.S" |
|
||||||
|
|
||||||
/* |
|
||||||
* VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle |
|
||||||
* throughput for almost all the instructions (except for double precision |
|
||||||
* arithmetics), but rather high latency. Latency is 4 cycles for loads and 8 cycles |
|
||||||
* for arithmetic operations. Scheduling code to avoid pipeline stalls is very |
|
||||||
* important for performance. One more interesting feature is that VFP has |
|
||||||
* independent load/store and arithmetics pipelines, so it is possible to make |
|
||||||
* them work simultaneously and get more than 1 operation per cycle. Load/store |
|
||||||
* pipeline can process 2 single precision floating point values per cycle and |
|
||||||
* supports bulk loads and stores for large sets of registers. Arithmetic operations |
|
||||||
* can be done on vectors, which allows to keep the arithmetics pipeline busy, |
|
||||||
* while the processor may issue and execute other instructions. Detailed |
|
||||||
* optimization manuals can be found at http://www.arm.com |
|
||||||
*/ |
|
||||||
|
|
||||||
/** |
|
||||||
* ARM VFP optimized implementation of 'vector_fmul_reverse_c' function. |
|
||||||
* Assume that len is a positive number and is multiple of 8 |
|
||||||
*/ |
|
||||||
@ void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
|
|
||||||
@ const float *src1, int len)
|
|
||||||
function ff_vector_fmul_reverse_vfp, export=1 |
|
||||||
vpush {d8-d15} |
|
||||||
add r2, r2, r3, lsl #2 |
|
||||||
vldmdb r2!, {s0-s3} |
|
||||||
vldmia r1!, {s8-s11} |
|
||||||
vldmdb r2!, {s4-s7} |
|
||||||
vldmia r1!, {s12-s15} |
|
||||||
vmul.f32 s8, s3, s8 |
|
||||||
vmul.f32 s9, s2, s9 |
|
||||||
vmul.f32 s10, s1, s10 |
|
||||||
vmul.f32 s11, s0, s11 |
|
||||||
1: |
|
||||||
subs r3, r3, #16 |
|
||||||
it ge |
|
||||||
vldmdbge r2!, {s16-s19} |
|
||||||
vmul.f32 s12, s7, s12 |
|
||||||
it ge |
|
||||||
vldmiage r1!, {s24-s27} |
|
||||||
vmul.f32 s13, s6, s13 |
|
||||||
it ge |
|
||||||
vldmdbge r2!, {s20-s23} |
|
||||||
vmul.f32 s14, s5, s14 |
|
||||||
it ge |
|
||||||
vldmiage r1!, {s28-s31} |
|
||||||
vmul.f32 s15, s4, s15 |
|
||||||
it ge |
|
||||||
vmulge.f32 s24, s19, s24 |
|
||||||
it gt |
|
||||||
vldmdbgt r2!, {s0-s3} |
|
||||||
it ge |
|
||||||
vmulge.f32 s25, s18, s25 |
|
||||||
vstmia r0!, {s8-s13} |
|
||||||
it ge |
|
||||||
vmulge.f32 s26, s17, s26 |
|
||||||
it gt |
|
||||||
vldmiagt r1!, {s8-s11} |
|
||||||
itt ge |
|
||||||
vmulge.f32 s27, s16, s27 |
|
||||||
vmulge.f32 s28, s23, s28 |
|
||||||
it gt |
|
||||||
vldmdbgt r2!, {s4-s7} |
|
||||||
it ge |
|
||||||
vmulge.f32 s29, s22, s29 |
|
||||||
vstmia r0!, {s14-s15} |
|
||||||
ittt ge |
|
||||||
vmulge.f32 s30, s21, s30 |
|
||||||
vmulge.f32 s31, s20, s31 |
|
||||||
vmulge.f32 s8, s3, s8 |
|
||||||
it gt |
|
||||||
vldmiagt r1!, {s12-s15} |
|
||||||
itttt ge |
|
||||||
vmulge.f32 s9, s2, s9 |
|
||||||
vmulge.f32 s10, s1, s10 |
|
||||||
vstmiage r0!, {s24-s27} |
|
||||||
vmulge.f32 s11, s0, s11 |
|
||||||
it ge |
|
||||||
vstmiage r0!, {s28-s31} |
|
||||||
bgt 1b |
|
||||||
|
|
||||||
vpop {d8-d15} |
|
||||||
bx lr |
|
||||||
endfunc |
|
||||||
@ -1,57 +0,0 @@ |
|||||||
/*
|
|
||||||
* Copyright (c) 2006 Luca Barbato <lu_zero@gentoo.org> |
|
||||||
* |
|
||||||
* This file is part of Libav. |
|
||||||
* |
|
||||||
* 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. |
|
||||||
* |
|
||||||
* 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 Libav; if not, write to the Free Software |
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
||||||
*/ |
|
||||||
|
|
||||||
#include "libavutil/ppc/util_altivec.h" |
|
||||||
#include "libavcodec/dsputil.h" |
|
||||||
|
|
||||||
#include "dsputil_altivec.h" |
|
||||||
|
|
||||||
static void vector_fmul_reverse_altivec(float *dst, const float *src0, |
|
||||||
const float *src1, int len) |
|
||||||
{ |
|
||||||
int i; |
|
||||||
vector float d, s0, s1, h0, l0, |
|
||||||
s2, s3, zero = (vector float)vec_splat_u32(0); |
|
||||||
src1 += len-4; |
|
||||||
for(i=0; i<len-7; i+=8) { |
|
||||||
s1 = vec_ld(0, src1-i); // [a,b,c,d]
|
|
||||||
s0 = vec_ld(0, src0+i); |
|
||||||
l0 = vec_mergel(s1, s1); // [c,c,d,d]
|
|
||||||
s3 = vec_ld(-16, src1-i); |
|
||||||
h0 = vec_mergeh(s1, s1); // [a,a,b,b]
|
|
||||||
s2 = vec_ld(16, src0+i); |
|
||||||
s1 = vec_mergeh(vec_mergel(l0,h0), // [d,b,d,b]
|
|
||||||
vec_mergeh(l0,h0)); // [c,a,c,a]
|
|
||||||
// [d,c,b,a]
|
|
||||||
l0 = vec_mergel(s3, s3); |
|
||||||
d = vec_madd(s0, s1, zero); |
|
||||||
h0 = vec_mergeh(s3, s3); |
|
||||||
vec_st(d, 0, dst+i); |
|
||||||
s3 = vec_mergeh(vec_mergel(l0,h0), |
|
||||||
vec_mergeh(l0,h0)); |
|
||||||
d = vec_madd(s2, s3, zero); |
|
||||||
vec_st(d, 16, dst+i); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx) |
|
||||||
{ |
|
||||||
c->vector_fmul_reverse = vector_fmul_reverse_altivec; |
|
||||||
} |
|
||||||
Loading…
Reference in new issue