mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
ARM: use const macro to define constant data in asm
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
39c2a6bf44
commit
11043d80f6
@ -349,9 +349,7 @@ function ff_fft_permute_neon, export=1
|
|||||||
pop {r4,pc}
|
pop {r4,pc}
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
.section .rodata
|
const fft_tab_neon
|
||||||
.align 4
|
|
||||||
fft_tab_neon:
|
|
||||||
.word fft4_neon
|
.word fft4_neon
|
||||||
.word fft8_neon
|
.word fft8_neon
|
||||||
.word fft16_neon
|
.word fft16_neon
|
||||||
@ -367,8 +365,12 @@ fft_tab_neon:
|
|||||||
.word fft16384_neon
|
.word fft16384_neon
|
||||||
.word fft32768_neon
|
.word fft32768_neon
|
||||||
.word fft65536_neon
|
.word fft65536_neon
|
||||||
ELF .size fft_tab_neon, . - fft_tab_neon
|
endconst
|
||||||
|
|
||||||
.align 4
|
const pmmp, align=4
|
||||||
pmmp: .float +1.0, -1.0, -1.0, +1.0
|
.float +1.0, -1.0, -1.0, +1.0
|
||||||
mppm: .float -M_SQRT1_2, M_SQRT1_2, M_SQRT1_2, -M_SQRT1_2
|
endconst
|
||||||
|
|
||||||
|
const mppm, align=4
|
||||||
|
.float -M_SQRT1_2, M_SQRT1_2, M_SQRT1_2, -M_SQRT1_2
|
||||||
|
endconst
|
||||||
|
@ -383,8 +383,8 @@ function ff_h264_idct8_add4_neon, export=1
|
|||||||
pop {r4-r8,pc}
|
pop {r4-r8,pc}
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
.section .rodata
|
const scan8
|
||||||
scan8: .byte 4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8
|
.byte 4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8
|
||||||
.byte 6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8
|
.byte 6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8
|
||||||
.byte 4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8
|
.byte 4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8
|
||||||
.byte 6+ 3*8, 7+ 3*8, 6+ 4*8, 7+ 4*8
|
.byte 6+ 3*8, 7+ 3*8, 6+ 4*8, 7+ 4*8
|
||||||
@ -396,3 +396,4 @@ scan8: .byte 4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8
|
|||||||
.byte 6+11*8, 7+11*8, 6+12*8, 7+12*8
|
.byte 6+11*8, 7+11*8, 6+12*8, 7+12*8
|
||||||
.byte 4+13*8, 5+13*8, 4+14*8, 5+14*8
|
.byte 4+13*8, 5+13*8, 4+14*8, 5+14*8
|
||||||
.byte 6+13*8, 7+13*8, 6+14*8, 7+14*8
|
.byte 6+13*8, 7+13*8, 6+14*8, 7+14*8
|
||||||
|
endconst
|
||||||
|
@ -166,12 +166,9 @@ function ff_pred16x16_plane_neon, export=1
|
|||||||
bx lr
|
bx lr
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
.section .rodata
|
const p16weight, align=4
|
||||||
.align 4
|
|
||||||
p16weight:
|
|
||||||
.short 1,2,3,4,5,6,7,8
|
.short 1,2,3,4,5,6,7,8
|
||||||
|
endconst
|
||||||
.text
|
|
||||||
|
|
||||||
function ff_pred8x8_hor_neon, export=1
|
function ff_pred8x8_hor_neon, export=1
|
||||||
sub r2, r0, #1
|
sub r2, r0, #1
|
||||||
|
@ -243,10 +243,9 @@ function idct_col4_st8_neon
|
|||||||
bx lr
|
bx lr
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
.section .rodata
|
const idct_coeff_neon, align=4
|
||||||
.align 4
|
|
||||||
idct_coeff_neon:
|
|
||||||
.short W1, W2, W3, W4, W5, W6, W7, W4c
|
.short W1, W2, W3, W4, W5, W6, W7, W4c
|
||||||
|
endconst
|
||||||
|
|
||||||
.macro idct_start data
|
.macro idct_start data
|
||||||
push {r4-r7, lr}
|
push {r4-r7, lr}
|
||||||
|
@ -20,11 +20,9 @@
|
|||||||
|
|
||||||
#include "asm.S"
|
#include "asm.S"
|
||||||
|
|
||||||
.section .rodata
|
const vp3_idct_constants, align=4
|
||||||
.align 4
|
|
||||||
|
|
||||||
vp3_idct_constants:
|
|
||||||
.short 64277, 60547, 54491, 46341, 36410, 25080, 12785
|
.short 64277, 60547, 54491, 46341, 36410, 25080, 12785
|
||||||
|
endconst
|
||||||
|
|
||||||
#define xC1S7 d0[0]
|
#define xC1S7 d0[0]
|
||||||
#define xC2S6 d0[1]
|
#define xC2S6 d0[1]
|
||||||
@ -34,8 +32,6 @@ vp3_idct_constants:
|
|||||||
#define xC6S2 d1[1]
|
#define xC6S2 d1[1]
|
||||||
#define xC7S1 d1[2]
|
#define xC7S1 d1[2]
|
||||||
|
|
||||||
.text
|
|
||||||
|
|
||||||
.macro vp3_loop_filter
|
.macro vp3_loop_filter
|
||||||
vsubl.u8 q3, d18, d17
|
vsubl.u8 q3, d18, d17
|
||||||
vsubl.u8 q2, d16, d19
|
vsubl.u8 q2, d16, d19
|
||||||
|
@ -240,9 +240,9 @@ A orrcs r8, r8, r10, lsl r6
|
|||||||
b 5b
|
b 5b
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
.section .rodata
|
const zigzag_scan
|
||||||
zigzag_scan:
|
|
||||||
.byte 0, 2, 8, 16
|
.byte 0, 2, 8, 16
|
||||||
.byte 10, 4, 6, 12
|
.byte 10, 4, 6, 12
|
||||||
.byte 18, 24, 26, 20
|
.byte 18, 24, 26, 20
|
||||||
.byte 14, 22, 28, 30
|
.byte 14, 22, 28, 30
|
||||||
|
endconst
|
||||||
|
Loading…
Reference in New Issue
Block a user