From a1c7fe431c5077e8bcf78d696c01ef653c34db2c Mon Sep 17 00:00:00 2001 From: Nedeljko Babic Date: Thu, 30 Apr 2015 13:51:35 +0200 Subject: [PATCH] libavutil/softfloat: exponent adjusted for aac fixed point dec Exponent usage and calculation in softfloat adjusted to the format used in implementation of fixed point aac decoder. Signed-off-by: Nedeljko Babic Signed-off-by: Michael Niedermayer --- libavutil/softfloat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index 2e85765fe9..5f4ac26ae1 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -83,7 +83,7 @@ static inline av_const SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ a.exp += b.exp; av_assert2((int32_t)((a.mant * (int64_t)b.mant) >> ONE_BITS) == (a.mant * (int64_t)b.mant) >> ONE_BITS); a.mant = (a.mant * (int64_t)b.mant) >> ONE_BITS; - return av_normalize1_sf(a); + return av_normalize1_sf((SoftFloat){a.mant, a.exp - 1}); } /** @@ -91,7 +91,7 @@ static inline av_const SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ * @return Will not be more denormalized than a. */ static av_const SoftFloat av_div_sf(SoftFloat a, SoftFloat b){ - a.exp -= b.exp+1; + a.exp -= b.exp; a.mant = ((int64_t)a.mant<<(ONE_BITS+1)) / b.mant; return av_normalize1_sf(a); } @@ -121,14 +121,14 @@ static inline av_const SoftFloat av_sub_sf(SoftFloat a, SoftFloat b){ * @returns a SoftFloat with value v * 2^frac_bits */ static inline av_const SoftFloat av_int2sf(int v, int frac_bits){ - return av_normalize_sf((SoftFloat){v, ONE_BITS-frac_bits}); + return av_normalize_sf((SoftFloat){v, ONE_BITS + 1 - frac_bits}); } /** * Rounding is to -inf. */ static inline av_const int av_sf2int(SoftFloat v, int frac_bits){ - v.exp += frac_bits - ONE_BITS; + v.exp += frac_bits - (ONE_BITS + 1); if(v.exp >= 0) return v.mant << v.exp ; else return v.mant >>(-v.exp); }