diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/binkaudio.c | 2 | ||||
| -rw-r--r-- | libavcodec/fft-test.c | 6 | ||||
| -rw-r--r-- | libavcodec/fft.h | 8 | ||||
| -rw-r--r-- | libavcodec/qdm2.c | 2 | ||||
| -rw-r--r-- | libavcodec/rdft.c | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 7462ab727e..b9d3df89c8 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -125,7 +125,7 @@ static av_cold int decode_init(AVCodecContext *avctx) 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 diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index e51736727f..db55b6033d 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -292,10 +292,10 @@ int main(int argc, char **argv) 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: diff --git a/libavcodec/fft.h b/libavcodec/fft.h index f3e7d7aa4e..9c2345a0bd 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -195,10 +195,10 @@ void ff_mdct_end(FFTContext *s); /* Real Discrete Fourier Transform */ enum RDFTransformType { - RDFT, - IRDFT, - RIDFT, - IRIDFT, + DFT_R2C, + IDFT_C2R, + IDFT_R2C, + DFT_C2R, }; typedef struct { diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index dcfa5320d7..797a464b84 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1928,7 +1928,7 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx) 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); diff --git a/libavcodec/rdft.c b/libavcodec/rdft.c index d5293e5e69..8878e744cf 100644 --- a/libavcodec/rdft.c +++ b/libavcodec/rdft.c @@ -53,21 +53,21 @@ av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans) { 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); |