X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Frdft.c;h=116cfa4366bceaa099e871486b080efeb8e894dd;hb=cc5e9e5ff052fe31aa757de79f2d11fb21df3fba;hp=ed4e39aa0858ca2e862d70228ac6ac15f34f53f8;hpb=aafd659518356d1ae3624830a36816f154d94d83;p=ffmpeg

diff --git a/libavcodec/rdft.c b/libavcodec/rdft.c
index ed4e39aa085..116cfa4366b 100644
--- a/libavcodec/rdft.c
+++ b/libavcodec/rdft.c
@@ -2,78 +2,59 @@
  * (I)RDFT transforms
  * Copyright (c) 2009 Alex Converse <alex dot converse at gmail dot com>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#include <stdlib.h>
 #include <math.h>
-#include "dsputil.h"
+#include "libavutil/mathematics.h"
+#include "rdft.h"
 
 /**
- * @file libavcodec/rdft.c
+ * @file
  * (Inverse) Real Discrete Fourier Transforms.
  */
 
 /* sin(2*pi*x/n) for 0<=x<n/4, followed by n/2<=x<3n/4 */
-DECLARE_ALIGNED_16(FFTSample, ff_sin_16[8]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_32[16]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_64[32]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_128[64]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_256[128]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_512[256]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_1024[512]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_2048[1024]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_4096[2048]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_8192[4096]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_16384[8192]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_32768[16384]);
-DECLARE_ALIGNED_16(FFTSample, ff_sin_65536[32768]);
-FFTSample * const ff_sin_tabs[] = {
+#if !CONFIG_HARDCODED_TABLES
+SINTABLE(16);
+SINTABLE(32);
+SINTABLE(64);
+SINTABLE(128);
+SINTABLE(256);
+SINTABLE(512);
+SINTABLE(1024);
+SINTABLE(2048);
+SINTABLE(4096);
+SINTABLE(8192);
+SINTABLE(16384);
+SINTABLE(32768);
+SINTABLE(65536);
+#endif
+static SINTABLE_CONST FFTSample * const ff_sin_tabs[] = {
+    NULL, NULL, NULL, NULL,
     ff_sin_16, ff_sin_32, ff_sin_64, ff_sin_128, ff_sin_256, ff_sin_512, ff_sin_1024,
     ff_sin_2048, ff_sin_4096, ff_sin_8192, ff_sin_16384, ff_sin_32768, ff_sin_65536,
 };
 
-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;
-
-    s->nbits           = nbits;
-    s->inverse         = trans == IRDFT || trans == IRIDFT;
-    s->sign_convention = trans == RIDFT || trans == IRIDFT ? 1 : -1;
-
-    if (nbits < 4 || nbits > 16)
-        return -1;
-
-    if (ff_fft_init(&s->fft, nbits-1, trans == IRDFT || trans == RIDFT) < 0)
-        return -1;
-
-    s->tcos = ff_cos_tabs[nbits-4];
-    s->tsin = ff_sin_tabs[nbits-4]+(trans == RDFT || trans == IRIDFT)*(n>>2);
-    for (i = 0; i < (n>>2); i++) {
-        s->tsin[i] = sin(i*theta);
-    }
-    return 0;
-}
-
 /** Map one real FFT into two parallel real even and odd FFTs. Then interleave
  * the two real FFTs into one complex FFT. Unmangle the results.
  * ref: http://www.engineeringproductivitytools.com/stuff/T0001/PT10.HTM
  */
-void ff_rdft_calc_c(RDFTContext* s, FFTSample* data)
+static void ff_rdft_calc_c(RDFTContext* s, FFTSample* data)
 {
     int i, i1, i2;
     FFTComplex ev, od;
@@ -84,8 +65,8 @@ void ff_rdft_calc_c(RDFTContext* s, FFTSample* data)
     const FFTSample *tsin = s->tsin;
 
     if (!s->inverse) {
-        ff_fft_permute(&s->fft, (FFTComplex*)data);
-        ff_fft_calc(&s->fft, (FFTComplex*)data);
+        s->fft.fft_permute(&s->fft, (FFTComplex*)data);
+        s->fft.fft_calc(&s->fft, (FFTComplex*)data);
     }
     /* i=0 is a special case because of packing, the DC term is real, so we
        are going to throw the N/2 term (also real) in with it. */
@@ -110,14 +91,40 @@ void ff_rdft_calc_c(RDFTContext* s, FFTSample* data)
     if (s->inverse) {
         data[0] *= k1;
         data[1] *= k1;
-        ff_fft_permute(&s->fft, (FFTComplex*)data);
-        ff_fft_calc(&s->fft, (FFTComplex*)data);
+        s->fft.fft_permute(&s->fft, (FFTComplex*)data);
+        s->fft.fft_calc(&s->fft, (FFTComplex*)data);
     }
 }
 
-void ff_rdft_calc(RDFTContext *s, FFTSample *data)
+av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans)
 {
-    ff_rdft_calc_c(s, data);
+    int n = 1 << nbits;
+    int i;
+    const double theta = (trans == DFT_R2C || trans == DFT_C2R ? -1 : 1)*2*M_PI/n;
+
+    s->nbits           = nbits;
+    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 == 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 == DFT_R2C || trans == DFT_C2R)*(n>>2);
+#if !CONFIG_HARDCODED_TABLES
+    for (i = 0; i < (n>>2); i++) {
+        s->tsin[i] = sin(i*theta);
+    }
+#endif
+    s->rdft_calc   = ff_rdft_calc_c;
+
+    if (ARCH_ARM) ff_rdft_init_arm(s);
+
+    return 0;
 }
 
 av_cold void ff_rdft_end(RDFTContext *s)