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

2019-06-04 Thread Michael Niedermayer 
On Thu, May 16, 2019 at 01:12:03PM +0200, Michael Niedermayer wrote:
> ---
>  libavcodec/aacdec_fixed.c | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)

will apply patchset

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

During times of universal deceit, telling the truth becomes a
revolutionary act. -- George Orwell


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

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

2019-05-16 Thread Michael Niedermayer 
---
 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> 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> s);
-coefs[i] = out * ssign;
+coefs[i] = -out;
 }
 }
 }
-- 
2.21.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".