diff options
| author | Måns Rullgård | 2010-07-01 23:21:42 +0000 |
|---|---|---|
| committer | Måns Rullgård | 2010-07-01 23:21:42 +0000 |
| commit | 588d28ac0866c8e9acb436c1c752de4c6de0d21e (patch) | |
| tree | 2a8e9098ec7f4ea499d9498c6bcc24004aea92ac /libavcodec/arm | |
| parent | bf7ba153729e2ea645cd6cc1150514137037923c (diff) | |
Remove vestiges of radix-2 FFT
Patch (mostly) by Loren Merritt
Originally committed as revision 23957 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/fft_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/mdct_neon.S | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/arm/fft_neon.S b/libavcodec/arm/fft_neon.S index 08589db096..c90333466d 100644 --- a/libavcodec/arm/fft_neon.S +++ b/libavcodec/arm/fft_neon.S @@ -320,7 +320,7 @@ function ff_fft_permute_neon, export=1 push {r4,lr} mov r12, #1 ldr r2, [r0] @ nbits - ldr r3, [r0, #20] @ tmp_buf + ldr r3, [r0, #12] @ tmp_buf ldr r0, [r0, #8] @ revtab lsl r12, r12, r2 mov r2, r12 diff --git a/libavcodec/arm/mdct_neon.S b/libavcodec/arm/mdct_neon.S index fac75be8e7..fcf802275f 100644 --- a/libavcodec/arm/mdct_neon.S +++ b/libavcodec/arm/mdct_neon.S @@ -31,8 +31,8 @@ function ff_imdct_half_neon, export=1 push {r4-r8,lr} mov r12, #1 - ldr lr, [r0, #28] @ mdct_bits - ldr r4, [r0, #32] @ tcos + ldr lr, [r0, #20] @ mdct_bits + ldr r4, [r0, #24] @ tcos ldr r3, [r0, #8] @ revtab lsl r12, r12, lr @ n = 1 << nbits lsr lr, r12, #2 @ n4 = n >> 2 @@ -76,8 +76,8 @@ function ff_imdct_half_neon, export=1 bl ff_fft_calc_neon mov r12, #1 - ldr lr, [r4, #28] @ mdct_bits - ldr r4, [r4, #32] @ tcos + ldr lr, [r4, #20] @ mdct_bits + ldr r4, [r4, #24] @ tcos lsl r12, r12, lr @ n = 1 << nbits lsr lr, r12, #3 @ n8 = n >> 3 @@ -127,7 +127,7 @@ endfunc function ff_imdct_calc_neon, export=1 push {r4-r6,lr} - ldr r3, [r0, #28] + ldr r3, [r0, #20] mov r4, #1 mov r5, r1 lsl r4, r4, r3 @@ -164,8 +164,8 @@ function ff_mdct_calc_neon, export=1 push {r4-r10,lr} mov r12, #1 - ldr lr, [r0, #28] @ mdct_bits - ldr r4, [r0, #32] @ tcos + ldr lr, [r0, #20] @ mdct_bits + ldr r4, [r0, #24] @ tcos ldr r3, [r0, #8] @ revtab lsl lr, r12, lr @ n = 1 << nbits add r7, r2, lr @ in4u @@ -253,8 +253,8 @@ function ff_mdct_calc_neon, export=1 bl ff_fft_calc_neon mov r12, #1 - ldr lr, [r4, #28] @ mdct_bits - ldr r4, [r4, #32] @ tcos + ldr lr, [r4, #20] @ mdct_bits + ldr r4, [r4, #24] @ tcos lsl r12, r12, lr @ n = 1 << nbits lsr lr, r12, #3 @ n8 = n >> 3 |