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

Merge commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf'

Browse Source 
* commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf':
  fft-test: Pass the right struct members instead of casting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-25 20:42:07 +02:00
commit aadf5222da
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/fft-test.c
View File

@ -367,15 +367,13 @@ int main(int argc, char **argv)
#if CONFIG_MDCT #if CONFIG_MDCT
case TRANSFORM_MDCT: case TRANSFORM_MDCT:
if (do_inverse) { if (do_inverse) {
imdct_ref((FFTSample *) tab_ref, (FFTSample *) tab1, fft_nbits); imdct_ref(&tab_ref->re, &tab1->re, fft_nbits);
m.imdct_calc(&m, tab2, (FFTSample *) tab1); m.imdct_calc(&m, tab2, &tab1->re);
err = check_diff((FFTSample *) tab_ref, tab2, fft_size, scale); err = check_diff(&tab_ref->re, tab2, fft_size, scale);
} else { } else {
mdct_ref((FFTSample *) tab_ref, (FFTSample *) tab1, fft_nbits); mdct_ref(&tab_ref->re, &tab1->re, fft_nbits);
m.mdct_calc(&m, tab2, &tab1->re);
m.mdct_calc(&m, tab2, (FFTSample *) tab1); err = check_diff(&tab_ref->re, tab2, fft_size / 2, scale);
err = check_diff((FFTSample *) tab_ref, tab2, fft_size / 2, scale);
} }
break; break;
#endif /* CONFIG_MDCT */ #endif /* CONFIG_MDCT */
@ -385,8 +383,7 @@ int main(int argc, char **argv)
s.fft_calc(&s, tab); s.fft_calc(&s, tab);
fft_ref(tab_ref, tab1, fft_nbits); fft_ref(tab_ref, tab1, fft_nbits);
err = check_diff((FFTSample *) tab_ref, (FFTSample *) tab, err = check_diff(&tab_ref->re, &tab->re, fft_size * 2, 1.0);
fft_size * 2, 1.0);
break; break;
#if FFT_FLOAT #if FFT_FLOAT
#if CONFIG_RDFT #if CONFIG_RDFT
@ -410,8 +407,7 @@ int main(int argc, char **argv)
tab[i].re = tab2[i]; tab[i].re = tab2[i];
tab[i].im = 0; tab[i].im = 0;
} }
err = check_diff((float *) tab_ref, (float *) tab, err = check_diff(&tab_ref->re, &tab->re, fft_size * 2, 0.5);
fft_size * 2, 0.5);
} else { } else {
for (i = 0; i < fft_size; i++) { for (i = 0; i < fft_size; i++) {
tab2[i] = tab1[i].re; tab2[i] = tab1[i].re;
@ -420,7 +416,7 @@ int main(int argc, char **argv)
r.rdft_calc(&r, tab2); r.rdft_calc(&r, tab2);
fft_ref(tab_ref, tab1, fft_nbits); fft_ref(tab_ref, tab1, fft_nbits);
tab_ref[0].im = tab_ref[fft_size_2].re; tab_ref[0].im = tab_ref[fft_size_2].re;
err = check_diff((float *) tab_ref, (float *) tab2, fft_size, 1.0); err = check_diff(&tab_ref->re, tab2, fft_size, 1.0);
} }
break; break;
} }
@ -433,7 +429,7 @@ int main(int argc, char **argv)
idct_ref(&tab_ref->re, &tab1->re, fft_nbits); idct_ref(&tab_ref->re, &tab1->re, fft_nbits);
else else
dct_ref(&tab_ref->re, &tab1->re, fft_nbits); dct_ref(&tab_ref->re, &tab1->re, fft_nbits);
err = check_diff((float *) tab_ref, (float *) tab, fft_size, 1.0); err = check_diff(&tab_ref->re, &tab->re, fft_size, 1.0);
break; break;
#endif /* CONFIG_DCT */ #endif /* CONFIG_DCT */
#endif /* FFT_FLOAT */ #endif /* FFT_FLOAT */
@ -454,9 +450,9 @@ int main(int argc, char **argv)
switch (transform) { switch (transform) {
case TRANSFORM_MDCT: case TRANSFORM_MDCT:
if (do_inverse) if (do_inverse)
m.imdct_calc(&m, (FFTSample *) tab, (FFTSample *) tab1); m.imdct_calc(&m, &tab->re, &tab1->re);
else else
m.mdct_calc(&m, (FFTSample *) tab, (FFTSample *) tab1); m.mdct_calc(&m, &tab->re, &tab1->re);
break; break;
case TRANSFORM_FFT: case TRANSFORM_FFT:
memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); memcpy(tab, tab1, fft_size * sizeof(FFTComplex));