aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdec_fixed.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-05-16 11:03:59 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-11 20:18:45 +0100
commit675035d18bf47fe868e280c0bc1a221e9e2fc00c (patch)
tree8eb81456fd0bc077357dc33d973e1f24d2e1f513 /libavcodec/aacdec_fixed.c
parentf5f6fb9a99eb6f12e1147f37867704bd595818e9 (diff)
downloadffmpeg-675035d18bf47fe868e280c0bc1a221e9e2fc00c.tar.gz
avcodec/aacdec_fixed: ssign seems always -1 in noise_scale(), simplify
(cherry picked from commit 3d5863d73915748013975cac8d2148c5fc3d01c3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/aacdec_fixed.c')
-rw-r--r--libavcodec/aacdec_fixed.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index ffcffbdaaa..35425bd468 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -195,12 +195,12 @@ static void subband_scale(int *dst, int *src, int scale, int offset, int len)
static void noise_scale(int *coefs, int scale, int band_energy, int len)
{
- int ssign = scale < 0 ? -1 : 1;
- int s = FFABS(scale);
+ int s = -scale;
unsigned int round;
int i, out, c = exp2tab[s & 3];
int nlz = 0;
+ av_assert0(s >= 0);
while (band_energy > 0x7fff) {
band_energy >>= 1;
nlz++;
@@ -216,7 +216,7 @@ static void noise_scale(int *coefs, int scale, int band_energy, int len)
round = s ? 1 << (s-1) : 0;
for (i=0; i<len; i++) {
out = (int)(((int64_t)coefs[i] * c) >> 32);
- coefs[i] = ((int)(out+round) >> s) * ssign;
+ coefs[i] = -((int)(out+round) >> s);
}
}
else {
@@ -224,7 +224,7 @@ static void noise_scale(int *coefs, int scale, int band_energy, int len)
round = s ? 1 << (s-1) : 0;
for (i=0; i<len; i++) {
out = (int)((int64_t)((int64_t)coefs[i] * c + round) >> s);
- coefs[i] = out * ssign;
+ coefs[i] = -out;
}
}
}