[FFmpeg-cvslog] r22609 - in trunk/libavcodec: fft.h rdft.c

[mru]

Author: mru
Date: Sat Mar 20 22:27:03 2010
New Revision: 22609

Log:
Call rdft by function pointer

Call the RDFT by a function pointer like other FFT related transforms.
This makes instruction set optimized versions possible.

Based on patch by Alex Converse.

Modified:
   trunk/libavcodec/fft.h
   trunk/libavcodec/rdft.c

Modified: trunk/libavcodec/fft.h
==============================================================================
--- trunk/libavcodec/fft.h	Sat Mar 20 17:51:36 2010	(r22608)
+++ trunk/libavcodec/fft.h	Sat Mar 20 22:27:03 2010	(r22609)
@@ -196,6 +196,7 @@ struct RDFTContext {
     const FFTSample *tcos;
     SINTABLE_CONST FFTSample *tsin;
     FFTContext fft;
+    void (*rdft_calc)(struct RDFTContext *s, FFTSample *z);
 };
 
 /**
@@ -204,9 +205,13 @@ struct RDFTContext {
  * @param trans           the type of transform
  */
 int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans);
-void ff_rdft_calc(RDFTContext *s, FFTSample *data);
 void ff_rdft_end(RDFTContext *s);
 
+static av_always_inline void ff_rdft_calc(RDFTContext *s, FFTSample *data)
+{
+    s->rdft_calc(s, data);
+}
+
 /* Discrete Cosine Transform */
 
 struct DCTContext {

Modified: trunk/libavcodec/rdft.c
==============================================================================
--- trunk/libavcodec/rdft.c	Sat Mar 20 17:51:36 2010	(r22608)
+++ trunk/libavcodec/rdft.c	Sat Mar 20 22:27:03 2010	(r22609)
@@ -50,6 +50,8 @@ SINTABLE_CONST FFTSample * const ff_sin_
     ff_sin_2048, ff_sin_4096, ff_sin_8192, ff_sin_16384, ff_sin_32768, ff_sin_65536,
 };
 
+static void ff_rdft_calc_c(RDFTContext* s, FFTSample* data);
+
 av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans)
 {
     int n = 1 << nbits;
@@ -74,6 +76,7 @@ av_cold int ff_rdft_init(RDFTContext *s,
         s->tsin[i] = sin(i*theta);
     }
 #endif
+    s->rdft_calc   = ff_rdft_calc_c;
     return 0;
 }
 
@@ -123,11 +126,6 @@ static void ff_rdft_calc_c(RDFTContext* 
     }
 }
 
-void ff_rdft_calc(RDFTContext *s, FFTSample *data)
-{
-    ff_rdft_calc_c(s, data);
-}
-
 av_cold void ff_rdft_end(RDFTContext *s)
 {
     ff_fft_end(&s->fft);