[FFmpeg-cvslog] avcodec/aacdec_fixed: ssign seems always -1 in noise_scale(), simplify
Michael Niedermayer
git at videolan.org
Tue Jun 4 14:20:17 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu May 16 11:03:59 2019 +0200| [3d5863d73915748013975cac8d2148c5fc3d01c3] | committer: Michael Niedermayer
avcodec/aacdec_fixed: ssign seems always -1 in noise_scale(), simplify
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d5863d73915748013975cac8d2148c5fc3d01c3
---
libavcodec/aacdec_fixed.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index b051e75709..0808c81005 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, vo
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;
}
}
}
More information about the ffmpeg-cvslog
mailing list