int32_t exp;
}SoftFloat;
+static inline av_const double av_sf2double(SoftFloat v) {
+ v.exp -= ONE_BITS +1;
+ if(v.exp > 0) return (double)v.mant * (double)(1 << v.exp);
+ else return (double)v.mant / (double)(1 << (-v.exp));
+}
+
static av_const SoftFloat av_normalize_sf(SoftFloat a){
if(a.mant){
#if 1
- while((a.mant + 0x20000000U)<0x40000000U){
+ while((a.mant + 0x1FFFFFFFU)<0x3FFFFFFFU){
a.mant += a.mant;
a.exp -= 1;
}
#else
- int s=ONE_BITS + 1 - av_log2(a.mant ^ (a.mant<<1));
+ int s=ONE_BITS - av_log2(FFABS(a.mant));
a.exp -= s;
a.mant <<= s;
#endif
static inline av_const SoftFloat av_normalize1_sf(SoftFloat a){
#if 1
- if((int32_t)(a.mant + 0x40000000U) < 0){
+ if((int32_t)(a.mant + 0x40000000U) <= 0){
a.exp++;
a.mant>>=1;
}
int t= a.mant + 0x40000000 < 0;
return (SoftFloat){ a.mant>>t, a.exp+t};
#else
- int t= (a.mant + 0x40000000U)>>31;
+ int t= (a.mant + 0x3FFFFFFFU)>>31;
return (SoftFloat){a.mant>>t, a.exp+t};
#endif
}
* b has to be normalized and not zero.
* @return Will not be more denormalized than a.
*/
-static av_const SoftFloat av_div_sf(SoftFloat a, SoftFloat b){
+static inline av_const SoftFloat av_div_sf(SoftFloat a, SoftFloat b){
a.exp -= b.exp;
a.mant = ((int64_t)a.mant<<(ONE_BITS+1)) / b.mant;
return av_normalize1_sf(a);
/**
* Rounding-to-nearest used.
*/
-static av_always_inline void av_sincos_sf(int a, int *s, int *c)
-{
- int idx, sign;
- int sv, cv;
- int st, ct;
-
- idx = a >> 26;
- sign = (idx << 27) >> 31;
- cv = av_costbl_1_sf[idx & 0xf];
- cv = (cv ^ sign) - sign;
-
- idx -= 8;
- sign = (idx << 27) >> 31;
- sv = av_costbl_1_sf[idx & 0xf];
- sv = (sv ^ sign) - sign;
-
- idx = a >> 21;
- ct = av_costbl_2_sf[idx & 0x1f];
- st = av_sintbl_2_sf[idx & 0x1f];
-
- idx = (int)(((int64_t)cv * ct - (int64_t)sv * st + 0x20000000) >> 30);
-
- sv = (int)(((int64_t)cv * st + (int64_t)sv * ct + 0x20000000) >> 30);
-
- cv = idx;
-
- idx = a >> 16;
- ct = av_costbl_3_sf[idx & 0x1f];
- st = av_sintbl_3_sf[idx & 0x1f];
-
- idx = (int)(((int64_t)cv * ct - (int64_t)sv * st + 0x20000000) >> 30);
-
- sv = (int)(((int64_t)cv * st + (int64_t)sv * ct + 0x20000000) >> 30);
- cv = idx;
-
- idx = a >> 11;
-
- ct = (int)(((int64_t)av_costbl_4_sf[idx & 0x1f] * (0x800 - (a & 0x7ff)) +
- (int64_t)av_costbl_4_sf[(idx & 0x1f)+1]*(a & 0x7ff) +
- 0x400) >> 11);
- st = (int)(((int64_t)av_sintbl_4_sf[idx & 0x1f] * (0x800 - (a & 0x7ff)) +
- (int64_t)av_sintbl_4_sf[(idx & 0x1f) + 1] * (a & 0x7ff) +
- 0x400) >> 11);
-
- *c = (int)(((int64_t)cv * ct + (int64_t)sv * st + 0x20000000) >> 30);
-
- *s = (int)(((int64_t)cv * st + (int64_t)sv * ct + 0x20000000) >> 30);
-}
+void av_sincos_sf(int a, int *s, int *c);
#endif /* AVUTIL_SOFTFLOAT_H */