diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 23:33:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 23:33:06 +0200 |
| commit | ec7ecb88117fd2d086f0be45ded9743c94100ef4 (patch) | |
| tree | 8536e70dd413e0dc1c5cd65dec3c37928ef3b8cc /libavcodec/arm/simple_idct_armv5te.S | |
| parent | 4c8fc6a2a41d1b8a4d3eb4452bb5d728253273f4 (diff) | |
| parent | 19cf7163c1576e7b03ea33d7bf633e14d7516db8 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
ARM: use =const syntax instead of explicit literal pools
ARM: use standard syntax for all LDRD/STRD instructions
fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
dct-test: allow to compile without HAVE_INLINE_ASM.
x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
dca: Move tables used outside of dcadec.c to a separate file.
dca: Rename dca.c ---> dcadec.c
x86: h264dsp: Remove unused variable ff_pb_3_1
apetag: change a forgotten return to return 0
Conflicts:
libavcodec/Makefile
libavcodec/dca.c
libavcodec/x86/fft_3dn.c
libavcodec/x86/fft_3dn2.c
libavcodec/x86/fft_mmx.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/simple_idct_armv5te.S')
| -rw-r--r-- | libavcodec/arm/simple_idct_armv5te.S | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/libavcodec/arm/simple_idct_armv5te.S b/libavcodec/arm/simple_idct_armv5te.S index 20a2305b65..d1f10b75cb 100644 --- a/libavcodec/arm/simple_idct_armv5te.S +++ b/libavcodec/arm/simple_idct_armv5te.S @@ -37,17 +37,11 @@ #define W26 (W2 | (W6 << 16)) #define W57 (W5 | (W7 << 16)) - .text - .align -w13: .long W13 -w26: .long W26 -w57: .long W57 - function idct_row_armv5te str lr, [sp, #-4]! - ldrd v1, [a1, #8] - ldrd a3, [a1] /* a3 = row[1:0], a4 = row[3:2] */ + ldrd v1, v2, [a1, #8] + ldrd a3, a4, [a1] /* a3 = row[1:0], a4 = row[3:2] */ orrs v1, v1, v2 itt eq cmpeq v1, a4 @@ -58,7 +52,7 @@ function idct_row_armv5te mov ip, #16384 sub ip, ip, #1 /* ip = W4 */ smlabb v1, ip, a3, v1 /* v1 = W4*row[0]+(1<<(RS-1)) */ - ldr ip, w26 /* ip = W2 | (W6 << 16) */ + ldr ip, =W26 /* ip = W2 | (W6 << 16) */ smultb a2, ip, a4 smulbb lr, ip, a4 add v2, v1, a2 @@ -66,8 +60,8 @@ function idct_row_armv5te sub v4, v1, lr add v1, v1, lr - ldr ip, w13 /* ip = W1 | (W3 << 16) */ - ldr lr, w57 /* lr = W5 | (W7 << 16) */ + ldr ip, =W13 /* ip = W1 | (W3 << 16) */ + ldr lr, =W57 /* lr = W5 | (W7 << 16) */ smulbt v5, ip, a3 smultt v6, lr, a4 smlatt v5, ip, a4, v5 @@ -78,7 +72,7 @@ function idct_row_armv5te smultt fp, lr, a3 sub v7, v7, a2 smulbt a2, lr, a4 - ldrd a3, [a1, #8] /* a3=row[5:4] a4=row[7:6] */ + ldrd a3, a4, [a1, #8] /* a3=row[5:4] a4=row[7:6] */ sub fp, fp, a2 orrs a2, a3, a4 @@ -94,7 +88,7 @@ function idct_row_armv5te smlatt v7, ip, a4, v7 sub fp, fp, a2 - ldr ip, w26 /* ip = W2 | (W6 << 16) */ + ldr ip, =W26 /* ip = W2 | (W6 << 16) */ mov a2, #16384 sub a2, a2, #1 /* a2 = W4 */ smulbb a2, a2, a3 /* a2 = W4*row[4] */ @@ -121,7 +115,7 @@ function idct_row_armv5te add a2, v4, fp mov a2, a2, lsr #11 add a4, a4, a2, lsl #16 - strd a3, [a1] + strd a3, a4, [a1] sub a2, v4, fp mov a3, a2, lsr #11 @@ -135,7 +129,7 @@ function idct_row_armv5te sub a2, v1, v5 mov a2, a2, lsr #11 add a4, a4, a2, lsl #16 - strd a3, [a1, #8] + strd a3, a4, [a1, #8] ldr pc, [sp], #4 @@ -144,8 +138,8 @@ row_dc_only: bic a3, a3, #0xe000 mov a3, a3, lsl #3 mov a4, a3 - strd a3, [a1] - strd a3, [a1, #8] + strd a3, a4, [a1] + strd a3, a4, [a1, #8] ldr pc, [sp], #4 endfunc @@ -178,7 +172,7 @@ endfunc sub v4, v2, a3 sub v6, v2, a3 add fp, v2, a3 - ldr ip, w26 + ldr ip, =W26 ldr a4, [a1, #(16*2)] add v2, v2, a3 @@ -211,9 +205,9 @@ endfunc stmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp} - ldr ip, w13 + ldr ip, =W13 ldr a4, [a1, #(16*1)] - ldr lr, w57 + ldr lr, =W57 smulbb v1, ip, a4 smultb v3, ip, a4 smulbb v5, lr, a4 |