aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-07 21:47:44 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-07 21:47:44 +0000
commit41ea18fb0db3c22943458e23d604158f2c95d4ca (patch)
tree91152cc29a4c953d1b483018956f9dcbd761eb8e
parent3bd8a2ef6c39caba25627ec6a608a15d07f3f8bb (diff)
downloadffmpeg-41ea18fb0db3c22943458e23d604158f2c95d4ca.tar.gz
Give RDFT types more meaningful names
Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c2
-rw-r--r--libavcodec/binkaudio.c2
-rw-r--r--libavcodec/fft-test.c6
-rw-r--r--libavcodec/fft.h8
-rw-r--r--libavcodec/qdm2.c2
-rw-r--r--libavcodec/rdft.c10
6 files changed, 15 insertions, 15 deletions
diff --git a/ffplay.c b/ffplay.c
index 89b58fc11c..25c7b52833 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -906,7 +906,7 @@ static void video_audio_display(VideoState *s)
nb_display_channels= FFMIN(nb_display_channels, 2);
if(rdft_bits != s->rdft_bits){
ff_rdft_end(&s->rdft);
- ff_rdft_init(&s->rdft, rdft_bits, RDFT);
+ ff_rdft_init(&s->rdft, rdft_bits, DFT_R2C);
s->rdft_bits= rdft_bits;
}
{
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);