Reviewed-by: Kostya Shishkov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.1
| @@ -463,7 +463,7 @@ NOVFP ldr a1, [fp, #-8*4] | |||||
| VFP stmia sp, {WINDOW, OUT, BUF} | VFP stmia sp, {WINDOW, OUT, BUF} | ||||
| NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT} | NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT} | ||||
| VFP vldr SCALE, [sp, #3*4] | VFP vldr SCALE, [sp, #3*4] | ||||
| bl ff_synth_filter_float_vfp | |||||
| bl X(ff_synth_filter_float_vfp) | |||||
| add OUT, OUT, #32*4 | add OUT, OUT, #32*4 | ||||
| add BUF, BUF, #32*4 | add BUF, BUF, #32*4 | ||||
| subs COUNT, COUNT, #1 | subs COUNT, COUNT, #1 | ||||
| @@ -151,7 +151,7 @@ function ff_imdct_half_vfp, export=1 | |||||
| ldr ip, [CONTEXT, #5*4] @ mdct_bits | ldr ip, [CONTEXT, #5*4] @ mdct_bits | ||||
| teq ip, #6 | teq ip, #6 | ||||
| it ne | it ne | ||||
| bne ff_imdct_half_c @ only case currently accelerated is the one used by DCA | |||||
| bne X(ff_imdct_half_c) @ only case currently accelerated is the one used by DCA | |||||
| .set n, 1<<6 | .set n, 1<<6 | ||||
| .set n2, n/2 | .set n2, n/2 | ||||
| @@ -175,7 +175,7 @@ function ff_imdct_half_vfp, export=1 | |||||
| fmxr FPSCR, OLDFPSCR | fmxr FPSCR, OLDFPSCR | ||||
| mov a1, OUT | mov a1, OUT | ||||
| bl ff_fft16_vfp | |||||
| bl X(ff_fft16_vfp) | |||||
| ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 | ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 | ||||
| fmxr FPSCR, lr | fmxr FPSCR, lr | ||||
| @@ -132,7 +132,7 @@ function ff_synth_filter_float_vfp, export=1 | |||||
| str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call | str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call | ||||
| ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half | ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half | ||||
| VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case | VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case | ||||
| bl ff_imdct_half_vfp | |||||
| bl X(ff_imdct_half_vfp) | |||||
| VFP vmov SCALE, s16 | VFP vmov SCALE, s16 | ||||
| fmrx OLDFPSCR, FPSCR | fmrx OLDFPSCR, FPSCR | ||||