diff options
| author | D G Turner | 2014-06-01 21:58:28 +0100 |
|---|---|---|
| committer | D G Turner | 2014-06-01 21:58:28 +0100 |
| commit | 9003ce517ff9906b0288f9f7c02197fd091d4554 (patch) | |
| tree | 3f203eec1009c31779219f77360c8ef1fff570c9 /audio/rate_arm_asm.s | |
| parent | 8f5a7cde2f99de9fef849b0ff688906f05f4643e (diff) | |
| download | scummvm-rg350-9003ce517ff9906b0288f9f7c02197fd091d4554.tar.gz scummvm-rg350-9003ce517ff9906b0288f9f7c02197fd091d4554.tar.bz2 scummvm-rg350-9003ce517ff9906b0288f9f7c02197fd091d4554.zip | |
AUDIO: Support 96kHz audio rates in ARM assembler rate conversion.
This should be the same changes as fuzzie's previous commit to the C++
version.
Diffstat (limited to 'audio/rate_arm_asm.s')
| -rw-r--r-- | audio/rate_arm_asm.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/audio/rate_arm_asm.s b/audio/rate_arm_asm.s index ac999f66e4..87e4c8aaf9 100644 --- a/audio/rate_arm_asm.s +++ b/audio/rate_arm_asm.s @@ -434,17 +434,17 @@ LinearRate_M_part2: LDRSH r4, [r3] @ r4 = obuf[0] LDRSH r5, [r3,#2] @ r5 = obuf[1] - MOV r6, r6, ASR #16 @ r6 = tmp0 = tmp1 >>= 16 + MOV r6, r6, ASR #15 @ r6 = tmp0 = tmp1 >>= 15 MUL r7, r12,r6 @ r7 = tmp0*vol_l MUL r6, r14,r6 @ r6 = tmp1*vol_r - ADDS r7, r7, r4, LSL #16 @ r7 = obuf[0]<<16 + tmp0*vol_l + ADDS r7, r7, r4, LSL #15 @ r7 = obuf[0]<<15 + tmp0*vol_l RSCVS r7, r10, #0x80000000 @ Clamp r7 - ADDS r6, r6, r5, LSL #16 @ r6 = obuf[1]<<16 + tmp1*vol_r + ADDS r6, r6, r5, LSL #15 @ r6 = obuf[1]<<15 + tmp1*vol_r RSCVS r6, r10, #0x80000000 @ Clamp r6 - MOV r7, r7, LSR #16 @ Shift back to halfword - MOV r6, r6, LSR #16 @ Shift back to halfword + MOV r7, r7, LSR #15 @ Shift back to halfword + MOV r6, r6, LSR #15 @ Shift back to halfword LDR r5, [r2,#12] @ r5 = opos_inc STRH r7, [r3],#2 @ Store output value @@ -530,23 +530,23 @@ LinearRate_S_part2: LDR r7, [r2,#24] @ r7 = ilast[1]<<16 + 32768 LDRSH r5, [r2,#18] @ r5 = icur[1] LDRSH r10,[r3] @ r10= obuf[0] - MOV r6, r6, ASR #16 @ r6 = tmp1 >>= 16 + MOV r6, r6, ASR #15 @ r6 = tmp1 >>= 15 SUB r5, r5, r7, ASR #16 @ r5 = icur[1] - ilast[1] MLA r7, r4, r5, r7 @ r7 = (icur[1]-ilast[1])*opos_frac+ilast[1] LDRSH r5, [r3,#2] @ r5 = obuf[1] - MOV r7, r7, ASR #16 @ r7 = tmp0 >>= 16 + MOV r7, r7, ASR #15 @ r7 = tmp0 >>= 15 MUL r7, r12,r7 @ r7 = tmp0*vol_l MUL r6, r14,r6 @ r6 = tmp1*vol_r - ADDS r7, r7, r10, LSL #16 @ r7 = obuf[0]<<16 + tmp0*vol_l + ADDS r7, r7, r10, LSL #15 @ r7 = obuf[0]<<15 + tmp0*vol_l MOV r4, #0 RSCVS r7, r4, #0x80000000 @ Clamp r7 - ADDS r6, r6, r5, LSL #16 @ r6 = obuf[1]<<16 + tmp1*vol_r + ADDS r6, r6, r5, LSL #15 @ r6 = obuf[1]<<15 + tmp1*vol_r RSCVS r6, r4, #0x80000000 @ Clamp r6 - MOV r7, r7, LSR #16 @ Shift back to halfword - MOV r6, r6, LSR #16 @ Shift back to halfword + MOV r7, r7, LSR #15 @ Shift back to halfword + MOV r6, r6, LSR #15 @ Shift back to halfword LDR r5, [r2,#12] @ r5 = opos_inc STRH r7, [r3],#2 @ Store output value @@ -632,23 +632,23 @@ LinearRate_R_part2: LDR r7, [r2,#24] @ r7 = ilast[1]<<16 + 32768 LDRSH r5, [r2,#18] @ r5 = icur[1] LDRSH r10,[r3,#2] @ r10= obuf[1] - MOV r6, r6, ASR #16 @ r6 = tmp1 >>= 16 + MOV r6, r6, ASR #15 @ r6 = tmp1 >>= 15 SUB r5, r5, r7, ASR #16 @ r5 = icur[1] - ilast[1] MLA r7, r4, r5, r7 @ r7 = (icur[1]-ilast[1])*opos_frac+ilast[1] LDRSH r5, [r3] @ r5 = obuf[0] - MOV r7, r7, ASR #16 @ r7 = tmp0 >>= 16 + MOV r7, r7, ASR #15 @ r7 = tmp0 >>= 15 MUL r7, r12,r7 @ r7 = tmp0*vol_l MUL r6, r14,r6 @ r6 = tmp1*vol_r - ADDS r7, r7, r10, LSL #16 @ r7 = obuf[1]<<16 + tmp0*vol_l + ADDS r7, r7, r10, LSL #15 @ r7 = obuf[1]<<15 + tmp0*vol_l MOV r4, #0 RSCVS r7, r4, #0x80000000 @ Clamp r7 - ADDS r6, r6, r5, LSL #16 @ r6 = obuf[0]<<16 + tmp1*vol_r + ADDS r6, r6, r5, LSL #15 @ r6 = obuf[0]<<15 + tmp1*vol_r RSCVS r6, r4, #0x80000000 @ Clamp r6 - MOV r7, r7, LSR #16 @ Shift back to halfword - MOV r6, r6, LSR #16 @ Shift back to halfword + MOV r7, r7, LSR #15 @ Shift back to halfword + MOV r6, r6, LSR #15 @ Shift back to halfword LDR r5, [r2,#12] @ r5 = opos_inc STRH r6, [r3],#2 @ Store output value |