X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fsoftfloat.h;h=97e09ea7e7ac4842aa07aed8d427711fadaf2c31;hb=7918375f8873ba465fc08e2bc00769ab0360327a;hp=a0d614bbd6f1e6847bb61ff21d78ae5761b09efa;hpb=e5a389a1b70a32a56aa83377e88bf718251aa8f0;p=ffmpeg diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index a0d614bbd6f..97e09ea7e7a 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -22,6 +22,7 @@ #define AVUTIL_SOFTFLOAT_H #include +#include "common.h" #define MIN_EXP -126 #define MAX_EXP 126 @@ -32,7 +33,7 @@ typedef struct SoftFloat{ int32_t mant; }SoftFloat; -static SoftFloat av_normalize_sf(SoftFloat a){ +static av_const SoftFloat av_normalize_sf(SoftFloat a){ if(a.mant){ #if 1 while((a.mant + 0x20000000U)<0x40000000U){ @@ -54,7 +55,7 @@ static SoftFloat av_normalize_sf(SoftFloat a){ return a; } -static inline SoftFloat av_normalize1_sf(SoftFloat a){ +static inline av_const SoftFloat av_normalize1_sf(SoftFloat a){ #if 1 if(a.mant + 0x40000000 < 0){ a.exp++; @@ -71,58 +72,55 @@ static inline SoftFloat av_normalize1_sf(SoftFloat a){ } /** - * - * @return will not be more denormalized then a+b, so if either input is - * normalized then the output wont be worse then the other input - * if both are normalized then the output will be normalized + * @return Will not be more denormalized than a+b. So if either input is + * normalized, then the output will not be worse then the other input. + * If both are normalized, then the output will be normalized. */ -static inline SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ +static inline av_const 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); } /** - * - * b has to be normalized and not zero - * @return will not be more denormalized then a + * b has to be normalized and not zero. + * @return Will not be more denormalized than a. */ -static SoftFloat av_div_sf(SoftFloat a, SoftFloat b){ +static av_const 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 int av_cmp_sf(SoftFloat a, SoftFloat b){ +static inline av_const 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 SoftFloat av_add_sf(SoftFloat a, SoftFloat b){ +static inline av_const 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 SoftFloat av_sub_sf(SoftFloat a, SoftFloat b){ +static inline av_const 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 SoftFloat av_int2sf(int v, int frac_bits){ +static inline av_const SoftFloat av_int2sf(int v, int frac_bits){ return av_normalize_sf((SoftFloat){ONE_BITS-frac_bits, v}); } /** - * - * rounding is to -inf + * Rounding is to -inf. */ -static inline int av_sf2int(SoftFloat v, int frac_bits){ +static inline av_const 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); } -#endif // AVUTIL_SOFTFLOAT_H +#endif /* AVUTIL_SOFTFLOAT_H */