diff options
author | Benoit Fouet <benoit.fouet@free.fr> | 2008-03-18 16:29:47 +0000 |
---|---|---|
committer | Benoit Fouet <benoit.fouet@free.fr> | 2008-03-18 16:29:47 +0000 |
commit | 2119bb8f51d5cbf946d8e87974a2d95016133942 (patch) | |
tree | a4cfee50d5b37ab8020f1292b4041b4a26b857c9 /libavutil/softfloat.h | |
parent | 6544f48f038552973a552401cea5d4e8f1fc9c0a (diff) | |
download | ffmpeg-2119bb8f51d5cbf946d8e87974a2d95016133942.tar.gz |
revert r12489.
Originally committed as revision 12490 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/softfloat.h')
-rw-r--r-- | libavutil/softfloat.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index bb8bb279be..d1a1901ea5 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -32,7 +32,7 @@ typedef struct SoftFloat{ int32_t mant; }SoftFloat; -static av_const SoftFloat av_normalize_sf(SoftFloat a){ +static SoftFloat av_normalize_sf(SoftFloat a){ if(a.mant){ #if 1 while((a.mant + 0x20000000U)<0x40000000U){ @@ -54,7 +54,7 @@ static av_const SoftFloat av_normalize_sf(SoftFloat a){ return a; } -static inline av_const SoftFloat av_normalize1_sf(SoftFloat a){ +static inline SoftFloat av_normalize1_sf(SoftFloat a){ #if 1 if(a.mant + 0x40000000 < 0){ a.exp++; @@ -76,7 +76,7 @@ static inline av_const SoftFloat av_normalize1_sf(SoftFloat a){ * normalized then the output wont be worse then the other input * if both are normalized then the output will be normalized */ -static inline av_const SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ +static inline SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ a.exp += b.exp; a.mant = (a.mant * (int64_t)b.mant) >> ONE_BITS; return av_normalize1_sf(a); @@ -87,31 +87,31 @@ static inline av_const SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ * b has to be normalized and not zero * @return will not be more denormalized then a */ -static av_const SoftFloat av_div_sf(SoftFloat a, SoftFloat b){ +static SoftFloat av_div_sf(SoftFloat a, SoftFloat b){ a.exp -= b.exp+1; a.mant = ((int64_t)a.mant<<(ONE_BITS+1)) / b.mant; return av_normalize1_sf(a); } -static inline av_const int av_cmp_sf(SoftFloat a, SoftFloat b){ +static inline int av_cmp_sf(SoftFloat a, SoftFloat b){ int t= a.exp - b.exp; if(t<0) return (a.mant >> (-t)) - b.mant ; else return a.mant - (b.mant >> t); } -static inline av_const SoftFloat av_add_sf(SoftFloat a, SoftFloat b){ +static inline SoftFloat av_add_sf(SoftFloat a, SoftFloat b){ int t= a.exp - b.exp; if(t<0) return av_normalize1_sf((SoftFloat){b.exp, b.mant + (a.mant >> (-t))}); else return av_normalize1_sf((SoftFloat){a.exp, a.mant + (b.mant >> t )}); } -static inline av_const SoftFloat av_sub_sf(SoftFloat a, SoftFloat b){ +static inline SoftFloat av_sub_sf(SoftFloat a, SoftFloat b){ return av_add_sf(a, (SoftFloat){b.exp, -b.mant}); } //FIXME sqrt, log, exp, pow, sin, cos -static inline av_const SoftFloat av_int2sf(int v, int frac_bits){ +static inline SoftFloat av_int2sf(int v, int frac_bits){ return av_normalize_sf((SoftFloat){ONE_BITS-frac_bits, v}); } @@ -119,7 +119,7 @@ static inline av_const SoftFloat av_int2sf(int v, int frac_bits){ * * rounding is to -inf */ -static inline av_const int av_sf2int(SoftFloat v, int frac_bits){ +static inline int av_sf2int(SoftFloat v, int frac_bits){ v.exp += frac_bits - ONE_BITS; if(v.exp >= 0) return v.mant << v.exp ; else return v.mant >>(-v.exp); |