Give RDFT types more meaningful names

Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index 89b58fc11c94b5185dd05d512bfc2db0ceaf8e18..25c7b5283328282fc415cf16399bebca6c6414dc 100644 (file)
--- 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 7462ab727eeb85cd2a6906f4846b67e7f00da4d1..b9d3df89c890653b10ee4e4ac432cd18ac4b26b7 100644 (file)
--- 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 e51736727f57f4d3e1dfe20f2bca6e8834a2a8f9..db55b6033d55327a3478bc02e9434cb7dd08f862 100644 (file)
--- 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 f3e7d7aa4ed632073c960729f06a45631eacf8f4..9c2345a0bd80f29a32d2fdc1bd40862989e71f8d 100644 (file)
--- 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 dcfa5320d763ee9b62da062a341913289afb40e1..797a464b841ad5a5cbb0cd916a0be8ae639cf6d0 100644 (file)
--- 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 d5293e5e69ea31d9f6513de6ca710a44175b3afe..8878e744cfe9e1ded1367b04ea51a25c79b36919 100644 (file)
--- 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);