generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/softfloat: Move av_sincos_sf() from header to c file

Browse Source 
The function is quite big and trigonometric functions should not really
be used in speed critical code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-05 13:30:54 +02:00
parent 19ed3e35a5
commit d3585c53de
2 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavutil/softfloat.c
View File

@ -37,6 +37,55 @@ static av_const double av_sf2double(SoftFloat v) {
else return (double)v.mant / (double)(1 << (-v.exp));
}
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);
}
int main(void){
SoftFloat one= av_int2sf(1, 0);
SoftFloat sf1, sf2, sf3;

49
libavutil/softfloat.h
View File

@ -175,53 +175,6 @@ static av_always_inline SoftFloat av_sqrt_sf(SoftFloat val)
/**
* 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 */