[FFmpeg-cvslog] fft-test: Pass the right struct members instead of casting
Diego Biurrun
git at videolan.org
Fri Jul 25 20:51:16 CEST 2014
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Jul 23 13:38:35 2014 -0700| [165e9df19567ec0b6abee1ee2c26027e6d7aa7bf] | committer: Diego Biurrun
fft-test: Pass the right struct members instead of casting
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=165e9df19567ec0b6abee1ee2c26027e6d7aa7bf
---
libavcodec/fft-test.c | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index 063f8b1..f62cf0d 100644
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -361,15 +361,13 @@ int main(int argc, char **argv)
#if CONFIG_MDCT
case TRANSFORM_MDCT:
if (do_inverse) {
- imdct_ref((FFTSample *) tab_ref, (FFTSample *) tab1, fft_nbits);
- m.imdct_calc(&m, tab2, (FFTSample *) tab1);
- err = check_diff((FFTSample *) tab_ref, tab2, fft_size, scale);
+ imdct_ref(&tab_ref->re, &tab1->re, fft_nbits);
+ m.imdct_calc(&m, tab2, &tab1->re);
+ err = check_diff(&tab_ref->re, tab2, fft_size, scale);
} else {
- mdct_ref((FFTSample *) tab_ref, (FFTSample *) tab1, fft_nbits);
-
- m.mdct_calc(&m, tab2, (FFTSample *) tab1);
-
- err = check_diff((FFTSample *) tab_ref, tab2, fft_size / 2, scale);
+ mdct_ref(&tab_ref->re, &tab1->re, fft_nbits);
+ m.mdct_calc(&m, tab2, &tab1->re);
+ err = check_diff(&tab_ref->re, tab2, fft_size / 2, scale);
}
break;
#endif /* CONFIG_MDCT */
@@ -379,8 +377,7 @@ int main(int argc, char **argv)
s.fft_calc(&s, tab);
fft_ref(tab_ref, tab1, fft_nbits);
- err = check_diff((FFTSample *) tab_ref, (FFTSample *) tab,
- fft_size * 2, 1.0);
+ err = check_diff(&tab_ref->re, &tab->re, fft_size * 2, 1.0);
break;
#if FFT_FLOAT
#if CONFIG_RDFT
@@ -404,8 +401,7 @@ int main(int argc, char **argv)
tab[i].re = tab2[i];
tab[i].im = 0;
}
- err = check_diff((float *) tab_ref, (float *) tab,
- fft_size * 2, 0.5);
+ err = check_diff(&tab_ref->re, &tab->re, fft_size * 2, 0.5);
} else {
for (i = 0; i < fft_size; i++) {
tab2[i] = tab1[i].re;
@@ -414,7 +410,7 @@ int main(int argc, char **argv)
r.rdft_calc(&r, tab2);
fft_ref(tab_ref, tab1, fft_nbits);
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;
}
@@ -427,7 +423,7 @@ int main(int argc, char **argv)
idct_ref(&tab_ref->re, &tab1->re, fft_nbits);
else
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;
#endif /* CONFIG_DCT */
#endif /* FFT_FLOAT */
@@ -448,9 +444,9 @@ int main(int argc, char **argv)
switch (transform) {
case TRANSFORM_MDCT:
if (do_inverse)
- m.imdct_calc(&m, (FFTSample *) tab, (FFTSample *) tab1);
+ m.imdct_calc(&m, &tab->re, &tab1->re);
else
- m.mdct_calc(&m, (FFTSample *) tab, (FFTSample *) tab1);
+ m.mdct_calc(&m, &tab->re, &tab1->re);
break;
case TRANSFORM_FFT:
memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
More information about the ffmpeg-cvslog
mailing list