[FFmpeg-cvslog] r22290 - in trunk: ffplay.c libavcodec/binkaudio.c libavcodec/fft-test.c libavcodec/fft.h libavcodec/qdm2.c libavcodec/rdft.c

[mru]

Author: mru
Date: Sun Mar  7 22:47:44 2010
New Revision: 22290

Log:
Give RDFT types more meaningful names

Modified:
   trunk/ffplay.c
   trunk/libavcodec/binkaudio.c
   trunk/libavcodec/fft-test.c
   trunk/libavcodec/fft.h
   trunk/libavcodec/qdm2.c
   trunk/libavcodec/rdft.c

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Mar  7 22:47:41 2010	(r22289)
+++ trunk/ffplay.c	Sun Mar  7 22:47:44 2010	(r22290)
@@ -906,7 +906,7 @@ static void video_audio_display(VideoSta
         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;
         }
         {

Modified: trunk/libavcodec/binkaudio.c
==============================================================================
--- trunk/libavcodec/binkaudio.c	Sun Mar  7 22:47:41 2010	(r22289)
+++ trunk/libavcodec/binkaudio.c	Sun Mar  7 22:47:44 2010	(r22290)
@@ -125,7 +125,7 @@ static av_cold int decode_init(AVCodecCo
         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

Modified: trunk/libavcodec/fft-test.c
==============================================================================
--- trunk/libavcodec/fft-test.c	Sun Mar  7 22:47:41 2010	(r22289)
+++ trunk/libavcodec/fft-test.c	Sun Mar  7 22:47:44 2010	(r22290)
@@ -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:

Modified: trunk/libavcodec/fft.h
==============================================================================
--- trunk/libavcodec/fft.h	Sun Mar  7 22:47:41 2010	(r22289)
+++ trunk/libavcodec/fft.h	Sun Mar  7 22:47:44 2010	(r22290)
@@ -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 {

Modified: trunk/libavcodec/qdm2.c
==============================================================================
--- trunk/libavcodec/qdm2.c	Sun Mar  7 22:47:41 2010	(r22289)
+++ trunk/libavcodec/qdm2.c	Sun Mar  7 22:47:44 2010	(r22290)
@@ -1928,7 +1928,7 @@ static av_cold int qdm2_decode_init(AVCo
         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);
 

Modified: trunk/libavcodec/rdft.c
==============================================================================
--- trunk/libavcodec/rdft.c	Sun Mar  7 22:47:41 2010	(r22289)
+++ trunk/libavcodec/rdft.c	Sun Mar  7 22:47:44 2010	(r22290)
@@ -53,21 +53,21 @@ av_cold int ff_rdft_init(RDFTContext *s,
 {
     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);