Mercurial > libavcodec.hg
changeset 11391:4c7afa50df6f libavcodec
Give RDFT types more meaningful names
| author | mru |
|---|---|
| date | Sun, 07 Mar 2010 21:47:44 +0000 |
| parents | 4a8900c06c67 |
| children | 384d803faff4 |
| files | binkaudio.c fft-test.c fft.h qdm2.c rdft.c |
| diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/binkaudio.c Sun Mar 07 21:47:41 2010 +0000 +++ b/binkaudio.c Sun Mar 07 21:47:44 2010 +0000 @@ -125,7 +125,7 @@ s->coeffs_ptr[i] = s->coeffs + i * s->frame_len; if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) - ff_rdft_init(&s->trans.rdft, frame_len_bits, IRIDFT); + ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R); else if (CONFIG_BINKAUDIO_DCT_DECODER) ff_dct_init(&s->trans.dct, frame_len_bits, 1); else
--- a/fft-test.c Sun Mar 07 21:47:41 2010 +0000 +++ b/fft-test.c Sun Mar 07 21:47:44 2010 +0000 @@ -292,10 +292,10 @@ break; case TRANSFORM_RDFT: if (do_inverse) - av_log(NULL, AV_LOG_INFO,"IRDFT"); + av_log(NULL, AV_LOG_INFO,"IDFT_C2R"); else - av_log(NULL, AV_LOG_INFO,"RDFT"); - ff_rdft_init(r, fft_nbits, do_inverse ? IRDFT : RDFT); + av_log(NULL, AV_LOG_INFO,"DFT_R2C"); + ff_rdft_init(r, fft_nbits, do_inverse ? IDFT_C2R : DFT_R2C); fft_ref_init(fft_nbits, do_inverse); break; case TRANSFORM_DCT:
--- a/fft.h Sun Mar 07 21:47:41 2010 +0000 +++ b/fft.h Sun Mar 07 21:47:44 2010 +0000 @@ -195,10 +195,10 @@ /* Real Discrete Fourier Transform */ enum RDFTransformType { - RDFT, - IRDFT, - RIDFT, - IRIDFT, + DFT_R2C, + IDFT_C2R, + IDFT_R2C, + DFT_C2R, }; typedef struct {
--- a/qdm2.c Sun Mar 07 21:47:41 2010 +0000 +++ b/qdm2.c Sun Mar 07 21:47:44 2010 +0000 @@ -1928,7 +1928,7 @@ return -1; } - ff_rdft_init(&s->rdft_ctx, s->fft_order, IRDFT); + ff_rdft_init(&s->rdft_ctx, s->fft_order, IDFT_C2R); qdm2_init(s);
--- a/rdft.c Sun Mar 07 21:47:41 2010 +0000 +++ b/rdft.c Sun Mar 07 21:47:44 2010 +0000 @@ -53,21 +53,21 @@ { int n = 1 << nbits; int i; - const double theta = (trans == RDFT || trans == IRIDFT ? -1 : 1)*2*M_PI/n; + const double theta = (trans == DFT_R2C || trans == DFT_C2R ? -1 : 1)*2*M_PI/n; s->nbits = nbits; - s->inverse = trans == IRDFT || trans == IRIDFT; - s->sign_convention = trans == RIDFT || trans == IRIDFT ? 1 : -1; + s->inverse = trans == IDFT_C2R || trans == DFT_C2R; + s->sign_convention = trans == IDFT_R2C || trans == DFT_C2R ? 1 : -1; if (nbits < 4 || nbits > 16) return -1; - if (ff_fft_init(&s->fft, nbits-1, trans == IRDFT || trans == RIDFT) < 0) + if (ff_fft_init(&s->fft, nbits-1, trans == IDFT_C2R || trans == IDFT_R2C) < 0) return -1; ff_init_ff_cos_tabs(nbits); s->tcos = ff_cos_tabs[nbits]; - s->tsin = ff_sin_tabs[nbits]+(trans == RDFT || trans == IRIDFT)*(n>>2); + s->tsin = ff_sin_tabs[nbits]+(trans == DFT_R2C || trans == DFT_C2R)*(n>>2); #if !CONFIG_HARDCODED_TABLES for (i = 0; i < (n>>2); i++) { s->tsin[i] = sin(i*theta);