[FFmpeg-devel,1/3] avcodec/aacdec_fixed: ssign seems always -1 in noise_scale(), simplify

Submitted by Michael Niedermayer on May 16, 2019, 11:12 a.m.

Details

Message ID 20190516111205.12971-1-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer May 16, 2019, 11:12 a.m.
---
 libavcodec/aacdec_fixed.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

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;
         }
     }
 }