Browse Source

arm: vp9itxfm: Rename a macro parameter to fit better

Since the same parameter is used for both input and output,
the name inout is more fitting.

This matches the naming used below in the dmbutterfly macro.

This is cherrypicked from libav commit
79566ec8c7.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3
Martin Storsjö Michael Niedermayer 9 years ago
parent
commit
f69dd26df5
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      libavcodec/arm/vp9itxfm_neon.S

+ 7
- 7
libavcodec/arm/vp9itxfm_neon.S View File

@@ -125,16 +125,16 @@ endconst
vmlal.s16 \out4, \in4, \coef1
.endm

@ in1 = (in1 * coef1 - in2 * coef2 + (1 << 13)) >> 14
@ in2 = (in1 * coef2 + in2 * coef1 + (1 << 13)) >> 14
@ in are 2 d registers, tmp are 2 q registers
.macro mbutterfly in1, in2, coef1, coef2, tmp1, tmp2, neg=0
mbutterfly_l \tmp1, \tmp2, \in1, \in2, \coef1, \coef2
@ inout1 = (inout1 * coef1 - inout2 * coef2 + (1 << 13)) >> 14
@ inout2 = (inout1 * coef2 + inout2 * coef1 + (1 << 13)) >> 14
@ inout are 2 d registers, tmp are 2 q registers
.macro mbutterfly inout1, inout2, coef1, coef2, tmp1, tmp2, neg=0
mbutterfly_l \tmp1, \tmp2, \inout1, \inout2, \coef1, \coef2
.if \neg > 0
vneg.s32 \tmp2, \tmp2
.endif
vrshrn.s32 \in1, \tmp1, #14
vrshrn.s32 \in2, \tmp2, #14
vrshrn.s32 \inout1, \tmp1, #14
vrshrn.s32 \inout2, \tmp2, #14
.endm

@ inout1,inout2 = (inout1,inout2 * coef1 - inout3,inout4 * coef2 + (1 << 13)) >> 14


Loading…
Cancel
Save