RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

fft_template: Move variables to where they are used.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2014-08-29 18:32:20 +02:00
parent 1654514ab0
commit 2bb66cc8be
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/fft_template.c
View File

@ -228,8 +228,6 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
int n4, n2, n34; int n4, n2, n34;
FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
FFTComplex *tmpz; FFTComplex *tmpz;
FFTSample w_re, w_im;
const FFTSample *w_re_ptr, *w_im_ptr;
const int fft_size = (1 << s->nbits); const int fft_size = (1 << s->nbits);
int64_t accu; int64_t accu;
@ -322,6 +320,8 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
num_transforms = (num_transforms >> 1) | 1; num_transforms = (num_transforms >> 1) | 1;
for (n=0; n<num_transforms; n++){ for (n=0; n<num_transforms; n++){
const FFTSample *w_re_ptr = ff_w_tab_sr + step;
const FFTSample *w_im_ptr = ff_w_tab_sr + MAX_FFT_SIZE/(4*16) - step;
offset = ff_fft_offsets_lut[n] << nbits; offset = ff_fft_offsets_lut[n] << nbits;
tmpz = z + offset; tmpz = z + offset;
@ -339,12 +339,9 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
tmpz[n34].im = tmpz[n4].im + tmp1; tmpz[n34].im = tmpz[n4].im + tmp1;
tmpz[ n4].im = tmpz[n4].im - tmp1; tmpz[ n4].im = tmpz[n4].im - tmp1;
w_re_ptr = ff_w_tab_sr + step;
w_im_ptr = ff_w_tab_sr + MAX_FFT_SIZE/(4*16) - step;
for (i=1; i<n4; i++){ for (i=1; i<n4; i++){
w_re = w_re_ptr[0]; FFTSample w_re = w_re_ptr[0];
w_im = w_im_ptr[0]; FFTSample w_im = w_im_ptr[0];
accu = (int64_t)w_re*tmpz[ n2+i].re; accu = (int64_t)w_re*tmpz[ n2+i].re;
accu += (int64_t)w_im*tmpz[ n2+i].im; accu += (int64_t)w_im*tmpz[ n2+i].im;
tmp1 = (int32_t)((accu + 0x40000000) >> 31); tmp1 = (int32_t)((accu + 0x40000000) >> 31);