/*
- * Copyright (c) 2019 Lynne <dev@lynne.ee>
+ * Copyright (c) Lynne
+ *
* Power of two FFT:
+ * Copyright (c) Lynne
* Copyright (c) 2008 Loren Merritt
* Copyright (c) 2002 Fabrice Bellard
* Partly based on libdjbfft by D. J. Bernstein
COSTABLE(65536);
COSTABLE(131072);
DECLARE_ALIGNED(32, FFTComplex, TX_NAME(ff_cos_53))[4];
+DECLARE_ALIGNED(32, FFTComplex, TX_NAME(ff_cos_7))[3];
+DECLARE_ALIGNED(32, FFTComplex, TX_NAME(ff_cos_9))[4];
static FFTSample * const cos_tabs[18] = {
NULL,
int m = 1 << index;
double freq = 2*M_PI/m;
FFTSample *tab = cos_tabs[index];
- for(int i = 0; i <= m/4; i++)
- tab[i] = RESCALE(cos(i*freq));
- for(int i = 1; i < m/4; i++)
- tab[m/2 - i] = tab[i];
+
+ for (int i = 0; i < m/4; i++)
+ *tab++ = RESCALE(cos(i*freq));
+
+ *tab = 0;
}
#define INIT_FF_COS_TABS_FUNC(index, size) \
TX_NAME(ff_cos_53)[3] = (FFTComplex){ RESCALE(cos(2 * M_PI / 10)), RESCALE(sin(2 * M_PI / 10)) };
}
+static av_cold void ff_init_7_tabs(void)
+{
+ TX_NAME(ff_cos_7)[0] = (FFTComplex){ RESCALE(cos(2 * M_PI / 7)), RESCALE(sin(2 * M_PI / 7)) };
+ TX_NAME(ff_cos_7)[1] = (FFTComplex){ RESCALE(sin(2 * M_PI / 28)), RESCALE(cos(2 * M_PI / 28)) };
+ TX_NAME(ff_cos_7)[2] = (FFTComplex){ RESCALE(cos(2 * M_PI / 14)), RESCALE(sin(2 * M_PI / 14)) };
+}
+
+static av_cold void ff_init_9_tabs(void)
+{
+ TX_NAME(ff_cos_9)[0] = (FFTComplex){ RESCALE(cos(2 * M_PI / 3)), RESCALE( sin(2 * M_PI / 3)) };
+ TX_NAME(ff_cos_9)[1] = (FFTComplex){ RESCALE(cos(2 * M_PI / 9)), RESCALE( sin(2 * M_PI / 9)) };
+ TX_NAME(ff_cos_9)[2] = (FFTComplex){ RESCALE(cos(2 * M_PI / 36)), RESCALE( sin(2 * M_PI / 36)) };
+ TX_NAME(ff_cos_9)[3] = (FFTComplex){ TX_NAME(ff_cos_9)[1].re + TX_NAME(ff_cos_9)[2].im,
+ TX_NAME(ff_cos_9)[1].im - TX_NAME(ff_cos_9)[2].re };
+}
+
static CosTabsInitOnce cos_tabs_init_once[] = {
{ ff_init_53_tabs, AV_ONCE_INIT },
- { NULL },
- { NULL },
+ { ff_init_7_tabs, AV_ONCE_INIT },
+ { ff_init_9_tabs, AV_ONCE_INIT },
{ NULL },
{ init_cos_tabs_16, AV_ONCE_INIT },
{ init_cos_tabs_32, AV_ONCE_INIT },
DECL_FFT5(fft5_m2, 10, 1, 7, 13, 4)
DECL_FFT5(fft5_m3, 5, 11, 2, 8, 14)
+static av_always_inline void fft7(FFTComplex *out, FFTComplex *in,
+ ptrdiff_t stride)
+{
+ FFTComplex t[6], z[3];
+ const FFTComplex *tab = TX_NAME(ff_cos_7);
+#ifdef TX_INT32
+ int64_t mtmp[12];
+#endif
+
+ BF(t[1].re, t[0].re, in[1].re, in[6].re);
+ BF(t[1].im, t[0].im, in[1].im, in[6].im);
+ BF(t[3].re, t[2].re, in[2].re, in[5].re);
+ BF(t[3].im, t[2].im, in[2].im, in[5].im);
+ BF(t[5].re, t[4].re, in[3].re, in[4].re);
+ BF(t[5].im, t[4].im, in[3].im, in[4].im);
+
+ out[0*stride].re = in[0].re + t[0].re + t[2].re + t[4].re;
+ out[0*stride].im = in[0].im + t[0].im + t[2].im + t[4].im;
+
+#ifdef TX_INT32 /* NOTE: it's possible to do this with 16 mults but 72 adds */
+ mtmp[ 0] = ((int64_t)tab[0].re)*t[0].re - ((int64_t)tab[2].re)*t[4].re;
+ mtmp[ 1] = ((int64_t)tab[0].re)*t[4].re - ((int64_t)tab[1].re)*t[0].re;
+ mtmp[ 2] = ((int64_t)tab[0].re)*t[2].re - ((int64_t)tab[2].re)*t[0].re;
+ mtmp[ 3] = ((int64_t)tab[0].re)*t[0].im - ((int64_t)tab[1].re)*t[2].im;
+ mtmp[ 4] = ((int64_t)tab[0].re)*t[4].im - ((int64_t)tab[1].re)*t[0].im;
+ mtmp[ 5] = ((int64_t)tab[0].re)*t[2].im - ((int64_t)tab[2].re)*t[0].im;
+
+ mtmp[ 6] = ((int64_t)tab[2].im)*t[1].im + ((int64_t)tab[1].im)*t[5].im;
+ mtmp[ 7] = ((int64_t)tab[0].im)*t[5].im + ((int64_t)tab[2].im)*t[3].im;
+ mtmp[ 8] = ((int64_t)tab[2].im)*t[5].im + ((int64_t)tab[1].im)*t[3].im;
+ mtmp[ 9] = ((int64_t)tab[0].im)*t[1].re + ((int64_t)tab[1].im)*t[3].re;
+ mtmp[10] = ((int64_t)tab[2].im)*t[3].re + ((int64_t)tab[0].im)*t[5].re;
+ mtmp[11] = ((int64_t)tab[2].im)*t[1].re + ((int64_t)tab[1].im)*t[5].re;
+
+ z[0].re = (int32_t)(mtmp[ 0] - ((int64_t)tab[1].re)*t[2].re + 0x40000000 >> 31);
+ z[1].re = (int32_t)(mtmp[ 1] - ((int64_t)tab[2].re)*t[2].re + 0x40000000 >> 31);
+ z[2].re = (int32_t)(mtmp[ 2] - ((int64_t)tab[1].re)*t[4].re + 0x40000000 >> 31);
+ z[0].im = (int32_t)(mtmp[ 3] - ((int64_t)tab[2].re)*t[4].im + 0x40000000 >> 31);
+ z[1].im = (int32_t)(mtmp[ 4] - ((int64_t)tab[2].re)*t[2].im + 0x40000000 >> 31);
+ z[2].im = (int32_t)(mtmp[ 5] - ((int64_t)tab[1].re)*t[4].im + 0x40000000 >> 31);
+
+ t[0].re = (int32_t)(mtmp[ 6] - ((int64_t)tab[0].im)*t[3].im + 0x40000000 >> 31);
+ t[2].re = (int32_t)(mtmp[ 7] - ((int64_t)tab[1].im)*t[1].im + 0x40000000 >> 31);
+ t[4].re = (int32_t)(mtmp[ 8] + ((int64_t)tab[0].im)*t[1].im + 0x40000000 >> 31);
+ t[0].im = (int32_t)(mtmp[ 9] + ((int64_t)tab[2].im)*t[5].re + 0x40000000 >> 31);
+ t[2].im = (int32_t)(mtmp[10] - ((int64_t)tab[1].im)*t[1].re + 0x40000000 >> 31);
+ t[4].im = (int32_t)(mtmp[11] - ((int64_t)tab[0].im)*t[3].re + 0x40000000 >> 31);
+#else
+ z[0].re = tab[0].re*t[0].re - tab[2].re*t[4].re - tab[1].re*t[2].re;
+ z[1].re = tab[0].re*t[4].re - tab[1].re*t[0].re - tab[2].re*t[2].re;
+ z[2].re = tab[0].re*t[2].re - tab[2].re*t[0].re - tab[1].re*t[4].re;
+ z[0].im = tab[0].re*t[0].im - tab[1].re*t[2].im - tab[2].re*t[4].im;
+ z[1].im = tab[0].re*t[4].im - tab[1].re*t[0].im - tab[2].re*t[2].im;
+ z[2].im = tab[0].re*t[2].im - tab[2].re*t[0].im - tab[1].re*t[4].im;
+
+ /* It's possible to do t[4].re and t[0].im with 2 multiplies only by
+ * multiplying the sum of all with the average of the twiddles */
+
+ t[0].re = tab[2].im*t[1].im + tab[1].im*t[5].im - tab[0].im*t[3].im;
+ t[2].re = tab[0].im*t[5].im + tab[2].im*t[3].im - tab[1].im*t[1].im;
+ t[4].re = tab[2].im*t[5].im + tab[1].im*t[3].im + tab[0].im*t[1].im;
+ t[0].im = tab[0].im*t[1].re + tab[1].im*t[3].re + tab[2].im*t[5].re;
+ t[2].im = tab[2].im*t[3].re + tab[0].im*t[5].re - tab[1].im*t[1].re;
+ t[4].im = tab[2].im*t[1].re + tab[1].im*t[5].re - tab[0].im*t[3].re;
+#endif
+
+ BF(t[1].re, z[0].re, z[0].re, t[4].re);
+ BF(t[3].re, z[1].re, z[1].re, t[2].re);
+ BF(t[5].re, z[2].re, z[2].re, t[0].re);
+ BF(t[1].im, z[0].im, z[0].im, t[0].im);
+ BF(t[3].im, z[1].im, z[1].im, t[2].im);
+ BF(t[5].im, z[2].im, z[2].im, t[4].im);
+
+ out[1*stride].re = in[0].re + z[0].re;
+ out[1*stride].im = in[0].im + t[1].im;
+ out[2*stride].re = in[0].re + t[3].re;
+ out[2*stride].im = in[0].im + z[1].im;
+ out[3*stride].re = in[0].re + z[2].re;
+ out[3*stride].im = in[0].im + t[5].im;
+ out[4*stride].re = in[0].re + t[5].re;
+ out[4*stride].im = in[0].im + z[2].im;
+ out[5*stride].re = in[0].re + z[1].re;
+ out[5*stride].im = in[0].im + t[3].im;
+ out[6*stride].re = in[0].re + t[1].re;
+ out[6*stride].im = in[0].im + z[0].im;
+}
+
+static av_always_inline void fft9(FFTComplex *out, FFTComplex *in,
+ ptrdiff_t stride)
+{
+ const FFTComplex *tab = TX_NAME(ff_cos_9);
+ FFTComplex t[16], w[4], x[5], y[5], z[2];
+#ifdef TX_INT32
+ int64_t mtmp[12];
+#endif
+
+ BF(t[1].re, t[0].re, in[1].re, in[8].re);
+ BF(t[1].im, t[0].im, in[1].im, in[8].im);
+ BF(t[3].re, t[2].re, in[2].re, in[7].re);
+ BF(t[3].im, t[2].im, in[2].im, in[7].im);
+ BF(t[5].re, t[4].re, in[3].re, in[6].re);
+ BF(t[5].im, t[4].im, in[3].im, in[6].im);
+ BF(t[7].re, t[6].re, in[4].re, in[5].re);
+ BF(t[7].im, t[6].im, in[4].im, in[5].im);
+
+ w[0].re = t[0].re - t[6].re;
+ w[0].im = t[0].im - t[6].im;
+ w[1].re = t[2].re - t[6].re;
+ w[1].im = t[2].im - t[6].im;
+ w[2].re = t[1].re - t[7].re;
+ w[2].im = t[1].im - t[7].im;
+ w[3].re = t[3].re + t[7].re;
+ w[3].im = t[3].im + t[7].im;
+
+ z[0].re = in[0].re + t[4].re;
+ z[0].im = in[0].im + t[4].im;
+
+ z[1].re = t[0].re + t[2].re + t[6].re;
+ z[1].im = t[0].im + t[2].im + t[6].im;
+
+ out[0*stride].re = z[0].re + z[1].re;
+ out[0*stride].im = z[0].im + z[1].im;
+
+#ifdef TX_INT32
+ mtmp[0] = t[1].re - t[3].re + t[7].re;
+ mtmp[1] = t[1].im - t[3].im + t[7].im;
+
+ y[3].re = (int32_t)(((int64_t)tab[0].im)*mtmp[0] + 0x40000000 >> 31);
+ y[3].im = (int32_t)(((int64_t)tab[0].im)*mtmp[1] + 0x40000000 >> 31);
+
+ mtmp[0] = (int32_t)(((int64_t)tab[0].re)*z[1].re + 0x40000000 >> 31);
+ mtmp[1] = (int32_t)(((int64_t)tab[0].re)*z[1].im + 0x40000000 >> 31);
+ mtmp[2] = (int32_t)(((int64_t)tab[0].re)*t[4].re + 0x40000000 >> 31);
+ mtmp[3] = (int32_t)(((int64_t)tab[0].re)*t[4].im + 0x40000000 >> 31);
+
+ x[3].re = z[0].re + (int32_t)mtmp[0];
+ x[3].im = z[0].im + (int32_t)mtmp[1];
+ z[0].re = in[0].re + (int32_t)mtmp[2];
+ z[0].im = in[0].im + (int32_t)mtmp[3];
+
+ mtmp[0] = ((int64_t)tab[1].re)*w[0].re;
+ mtmp[1] = ((int64_t)tab[1].re)*w[0].im;
+ mtmp[2] = ((int64_t)tab[2].im)*w[0].re;
+ mtmp[3] = ((int64_t)tab[2].im)*w[0].im;
+ mtmp[4] = ((int64_t)tab[1].im)*w[2].re;
+ mtmp[5] = ((int64_t)tab[1].im)*w[2].im;
+ mtmp[6] = ((int64_t)tab[2].re)*w[2].re;
+ mtmp[7] = ((int64_t)tab[2].re)*w[2].im;
+
+ x[1].re = (int32_t)(mtmp[0] + ((int64_t)tab[2].im)*w[1].re + 0x40000000 >> 31);
+ x[1].im = (int32_t)(mtmp[1] + ((int64_t)tab[2].im)*w[1].im + 0x40000000 >> 31);
+ x[2].re = (int32_t)(mtmp[2] - ((int64_t)tab[3].re)*w[1].re + 0x40000000 >> 31);
+ x[2].im = (int32_t)(mtmp[3] - ((int64_t)tab[3].re)*w[1].im + 0x40000000 >> 31);
+ y[1].re = (int32_t)(mtmp[4] + ((int64_t)tab[2].re)*w[3].re + 0x40000000 >> 31);
+ y[1].im = (int32_t)(mtmp[5] + ((int64_t)tab[2].re)*w[3].im + 0x40000000 >> 31);
+ y[2].re = (int32_t)(mtmp[6] - ((int64_t)tab[3].im)*w[3].re + 0x40000000 >> 31);
+ y[2].im = (int32_t)(mtmp[7] - ((int64_t)tab[3].im)*w[3].im + 0x40000000 >> 31);
+
+ y[0].re = (int32_t)(((int64_t)tab[0].im)*t[5].re + 0x40000000 >> 31);
+ y[0].im = (int32_t)(((int64_t)tab[0].im)*t[5].im + 0x40000000 >> 31);
+
+#else
+ y[3].re = tab[0].im*(t[1].re - t[3].re + t[7].re);
+ y[3].im = tab[0].im*(t[1].im - t[3].im + t[7].im);
+
+ x[3].re = z[0].re + tab[0].re*z[1].re;
+ x[3].im = z[0].im + tab[0].re*z[1].im;
+ z[0].re = in[0].re + tab[0].re*t[4].re;
+ z[0].im = in[0].im + tab[0].re*t[4].im;
+
+ x[1].re = tab[1].re*w[0].re + tab[2].im*w[1].re;
+ x[1].im = tab[1].re*w[0].im + tab[2].im*w[1].im;
+ x[2].re = tab[2].im*w[0].re - tab[3].re*w[1].re;
+ x[2].im = tab[2].im*w[0].im - tab[3].re*w[1].im;
+ y[1].re = tab[1].im*w[2].re + tab[2].re*w[3].re;
+ y[1].im = tab[1].im*w[2].im + tab[2].re*w[3].im;
+ y[2].re = tab[2].re*w[2].re - tab[3].im*w[3].re;
+ y[2].im = tab[2].re*w[2].im - tab[3].im*w[3].im;
+
+ y[0].re = tab[0].im*t[5].re;
+ y[0].im = tab[0].im*t[5].im;
+#endif
+
+ x[4].re = x[1].re + x[2].re;
+ x[4].im = x[1].im + x[2].im;
+
+ y[4].re = y[1].re - y[2].re;
+ y[4].im = y[1].im - y[2].im;
+ x[1].re = z[0].re + x[1].re;
+ x[1].im = z[0].im + x[1].im;
+ y[1].re = y[0].re + y[1].re;
+ y[1].im = y[0].im + y[1].im;
+ x[2].re = z[0].re + x[2].re;
+ x[2].im = z[0].im + x[2].im;
+ y[2].re = y[2].re - y[0].re;
+ y[2].im = y[2].im - y[0].im;
+ x[4].re = z[0].re - x[4].re;
+ x[4].im = z[0].im - x[4].im;
+ y[4].re = y[0].re - y[4].re;
+ y[4].im = y[0].im - y[4].im;
+
+ out[1*stride] = (FFTComplex){ x[1].re + y[1].im, x[1].im - y[1].re };
+ out[2*stride] = (FFTComplex){ x[2].re + y[2].im, x[2].im - y[2].re };
+ out[3*stride] = (FFTComplex){ x[3].re + y[3].im, x[3].im - y[3].re };
+ out[4*stride] = (FFTComplex){ x[4].re + y[4].im, x[4].im - y[4].re };
+ out[5*stride] = (FFTComplex){ x[4].re - y[4].im, x[4].im + y[4].re };
+ out[6*stride] = (FFTComplex){ x[3].re - y[3].im, x[3].im + y[3].re };
+ out[7*stride] = (FFTComplex){ x[2].re - y[2].im, x[2].im + y[2].re };
+ out[8*stride] = (FFTComplex){ x[1].re - y[1].im, x[1].im + y[1].re };
+}
+
static av_always_inline void fft15(FFTComplex *out, FFTComplex *in,
ptrdiff_t stride)
{
fft5_m3(out, tmp + 10, stride);
}
-#define BUTTERFLIES(a0,a1,a2,a3) {\
- BF(t3, t5, t5, t1);\
- BF(a2.re, a0.re, a0.re, t5);\
- BF(a3.im, a1.im, a1.im, t3);\
- BF(t4, t6, t2, t6);\
- BF(a3.re, a1.re, a1.re, t4);\
- BF(a2.im, a0.im, a0.im, t6);\
-}
-
-// force loading all the inputs before storing any.
-// this is slightly slower for small data, but avoids store->load aliasing
-// for addresses separated by large powers of 2.
-#define BUTTERFLIES_BIG(a0,a1,a2,a3) {\
- FFTSample r0=a0.re, i0=a0.im, r1=a1.re, i1=a1.im;\
- BF(t3, t5, t5, t1);\
- BF(a2.re, a0.re, r0, t5);\
- BF(a3.im, a1.im, i1, t3);\
- BF(t4, t6, t2, t6);\
- BF(a3.re, a1.re, r1, t4);\
- BF(a2.im, a0.im, i0, t6);\
-}
-
-#define TRANSFORM(a0,a1,a2,a3,wre,wim) {\
- CMUL(t1, t2, a2.re, a2.im, wre, -wim);\
- CMUL(t5, t6, a3.re, a3.im, wre, wim);\
- BUTTERFLIES(a0,a1,a2,a3)\
-}
-
-#define TRANSFORM_ZERO(a0,a1,a2,a3) {\
- t1 = a2.re;\
- t2 = a2.im;\
- t5 = a3.re;\
- t6 = a3.im;\
- BUTTERFLIES(a0,a1,a2,a3)\
-}
+#define BUTTERFLIES(a0,a1,a2,a3) \
+ do { \
+ r0=a0.re; \
+ i0=a0.im; \
+ r1=a1.re; \
+ i1=a1.im; \
+ BF(t3, t5, t5, t1); \
+ BF(a2.re, a0.re, r0, t5); \
+ BF(a3.im, a1.im, i1, t3); \
+ BF(t4, t6, t2, t6); \
+ BF(a3.re, a1.re, r1, t4); \
+ BF(a2.im, a0.im, i0, t6); \
+ } while (0)
+
+#define TRANSFORM(a0,a1,a2,a3,wre,wim) \
+ do { \
+ CMUL(t1, t2, a2.re, a2.im, wre, -wim); \
+ CMUL(t5, t6, a3.re, a3.im, wre, wim); \
+ BUTTERFLIES(a0, a1, a2, a3); \
+ } while (0)
/* z[0...8n-1], w[1...2n-1] */
-#define PASS(name)\
-static void name(FFTComplex *z, const FFTSample *wre, unsigned int n)\
-{\
- FFTSample t1, t2, t3, t4, t5, t6;\
- int o1 = 2*n;\
- int o2 = 4*n;\
- int o3 = 6*n;\
- const FFTSample *wim = wre+o1;\
- n--;\
-\
- TRANSFORM_ZERO(z[0],z[o1],z[o2],z[o3]);\
- TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\
- do {\
- z += 2;\
- wre += 2;\
- wim -= 2;\
- TRANSFORM(z[0],z[o1],z[o2],z[o3],wre[0],wim[0]);\
- TRANSFORM(z[1],z[o1+1],z[o2+1],z[o3+1],wre[1],wim[-1]);\
- } while(--n);\
+static void split_radix_combine(FFTComplex *z, const FFTSample *cos, int n)
+{
+ int o1 = 2*n;
+ int o2 = 4*n;
+ int o3 = 6*n;
+ const FFTSample *wim = cos + o1 - 7;
+ FFTSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1;
+
+ for (int i = 0; i < n; i += 4) {
+ TRANSFORM(z[0], z[o1 + 0], z[o2 + 0], z[o3 + 0], cos[0], wim[7]);
+ TRANSFORM(z[2], z[o1 + 2], z[o2 + 2], z[o3 + 2], cos[2], wim[5]);
+ TRANSFORM(z[4], z[o1 + 4], z[o2 + 4], z[o3 + 4], cos[4], wim[3]);
+ TRANSFORM(z[6], z[o1 + 6], z[o2 + 6], z[o3 + 6], cos[6], wim[1]);
+
+ TRANSFORM(z[1], z[o1 + 1], z[o2 + 1], z[o3 + 1], cos[1], wim[6]);
+ TRANSFORM(z[3], z[o1 + 3], z[o2 + 3], z[o3 + 3], cos[3], wim[4]);
+ TRANSFORM(z[5], z[o1 + 5], z[o2 + 5], z[o3 + 5], cos[5], wim[2]);
+ TRANSFORM(z[7], z[o1 + 7], z[o2 + 7], z[o3 + 7], cos[7], wim[0]);
+
+ z += 2*4;
+ cos += 2*4;
+ wim -= 2*4;
+ }
}
-PASS(pass)
-#undef BUTTERFLIES
-#define BUTTERFLIES BUTTERFLIES_BIG
-PASS(pass_big)
-
-#define DECL_FFT(n,n2,n4)\
-static void fft##n(FFTComplex *z)\
-{\
- fft##n2(z);\
- fft##n4(z+n4*2);\
- fft##n4(z+n4*3);\
- pass(z,TX_NAME(ff_cos_##n),n4/2);\
+#define DECL_FFT(n, n2, n4) \
+static void fft##n(FFTComplex *z) \
+{ \
+ fft##n2(z); \
+ fft##n4(z + n4*2); \
+ fft##n4(z + n4*3); \
+ split_radix_combine(z, TX_NAME(ff_cos_##n), n4/2); \
}
static void fft2(FFTComplex *z)
static void fft8(FFTComplex *z)
{
- FFTSample t1, t2, t3, t4, t5, t6;
+ FFTSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1;
fft4(z);
BF(t5, z[7].re, z[6].re, -z[7].re);
BF(t6, z[7].im, z[6].im, -z[7].im);
- BUTTERFLIES(z[0],z[2],z[4],z[6]);
- TRANSFORM(z[1],z[3],z[5],z[7],RESCALE(M_SQRT1_2),RESCALE(M_SQRT1_2));
+ BUTTERFLIES(z[0], z[2], z[4], z[6]);
+ TRANSFORM(z[1], z[3], z[5], z[7], RESCALE(M_SQRT1_2), RESCALE(M_SQRT1_2));
}
static void fft16(FFTComplex *z)
{
- FFTSample t1, t2, t3, t4, t5, t6;
+ FFTSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1;
FFTSample cos_16_1 = TX_NAME(ff_cos_16)[1];
+ FFTSample cos_16_2 = TX_NAME(ff_cos_16)[2];
FFTSample cos_16_3 = TX_NAME(ff_cos_16)[3];
- fft8(z);
- fft4(z+8);
- fft4(z+12);
+ fft8(z + 0);
+ fft4(z + 8);
+ fft4(z + 12);
- TRANSFORM_ZERO(z[0],z[4],z[8],z[12]);
- TRANSFORM(z[2],z[6],z[10],z[14],RESCALE(M_SQRT1_2),RESCALE(M_SQRT1_2));
- TRANSFORM(z[1],z[5],z[9],z[13],cos_16_1,cos_16_3);
- TRANSFORM(z[3],z[7],z[11],z[15],cos_16_3,cos_16_1);
+ t1 = z[ 8].re;
+ t2 = z[ 8].im;
+ t5 = z[12].re;
+ t6 = z[12].im;
+ BUTTERFLIES(z[0], z[4], z[8], z[12]);
+
+ TRANSFORM(z[ 2], z[ 6], z[10], z[14], cos_16_2, cos_16_2);
+ TRANSFORM(z[ 1], z[ 5], z[ 9], z[13], cos_16_1, cos_16_3);
+ TRANSFORM(z[ 3], z[ 7], z[11], z[15], cos_16_3, cos_16_1);
}
DECL_FFT(32,16,8)
DECL_FFT(128,64,32)
DECL_FFT(256,128,64)
DECL_FFT(512,256,128)
-#define pass pass_big
DECL_FFT(1024,512,256)
DECL_FFT(2048,1024,512)
DECL_FFT(4096,2048,1024)
for (int i = 0; i < m; i++) { \
for (int j = 0; j < N; j++) \
fft##N##in[j] = in[in_map[i*N + j]]; \
- fft##N(s->tmp + s->revtab[i], fft##N##in, m); \
+ fft##N(s->tmp + s->revtab_c[i], fft##N##in, m); \
} \
\
for (int i = 0; i < N; i++) \
DECL_COMP_FFT(3)
DECL_COMP_FFT(5)
+DECL_COMP_FFT(7)
+DECL_COMP_FFT(9)
DECL_COMP_FFT(15)
-static void monolithic_fft(AVTXContext *s, void *_out, void *_in,
- ptrdiff_t stride)
+static void split_radix_fft(AVTXContext *s, void *_out, void *_in,
+ ptrdiff_t stride)
{
FFTComplex *in = _in;
FFTComplex *out = _out;
do {
tmp = out[src];
- dst = s->revtab[src];
+ dst = s->revtab_c[src];
do {
FFSWAP(FFTComplex, tmp, out[dst]);
- dst = s->revtab[dst];
+ dst = s->revtab_c[dst];
} while (dst != src); /* Can be > as well, but is less predictable */
out[dst] = tmp;
} while ((src = *inplace_idx++));
} else {
for (int i = 0; i < m; i++)
- out[s->revtab[i]] = in[i];
+ out[i] = in[s->revtab_c[i]];
}
fft_dispatch[mb](out);
FFTComplex tmp = { in2[-k*stride], in1[k*stride] }; \
CMUL3(fft##N##in[j], tmp, exp[k >> 1]); \
} \
- fft##N(s->tmp + s->revtab[i], fft##N##in, m); \
+ fft##N(s->tmp + s->revtab_c[i], fft##N##in, m); \
} \
\
for (int i = 0; i < N; i++) \
DECL_COMP_IMDCT(3)
DECL_COMP_IMDCT(5)
+DECL_COMP_IMDCT(7)
+DECL_COMP_IMDCT(9)
DECL_COMP_IMDCT(15)
#define DECL_COMP_MDCT(N) \
CMUL(fft##N##in[j].im, fft##N##in[j].re, tmp.re, tmp.im, \
exp[k >> 1].re, exp[k >> 1].im); \
} \
- fft##N(s->tmp + s->revtab[i], fft##N##in, m); \
+ fft##N(s->tmp + s->revtab_c[i], fft##N##in, m); \
} \
\
for (int i = 0; i < N; i++) \
DECL_COMP_MDCT(3)
DECL_COMP_MDCT(5)
+DECL_COMP_MDCT(7)
+DECL_COMP_MDCT(9)
DECL_COMP_MDCT(15)
static void monolithic_imdct(AVTXContext *s, void *_dst, void *_src,
for (int i = 0; i < m; i++) {
FFTComplex tmp = { in2[-2*i*stride], in1[2*i*stride] };
- CMUL3(z[s->revtab[i]], tmp, exp[i]);
+ CMUL3(z[s->revtab_c[i]], tmp, exp[i]);
}
fftp(z);
tmp.re = FOLD(-src[ len4 + k], -src[5*len4 - 1 - k]);
tmp.im = FOLD( src[-len4 + k], -src[1*len3 - 1 - k]);
}
- CMUL(z[s->revtab[i]].im, z[s->revtab[i]].re, tmp.re, tmp.im,
+ CMUL(z[s->revtab_c[i]].im, z[s->revtab_c[i]].re, tmp.re, tmp.im,
exp[i].re, exp[i].im);
}
}
}
+static void full_imdct_wrapper_fn(AVTXContext *s, void *_dst, void *_src,
+ ptrdiff_t stride)
+{
+ int len = s->m*s->n*4;
+ int len2 = len >> 1;
+ int len4 = len >> 2;
+ FFTSample *dst = _dst;
+
+ s->top_tx(s, dst + len4, _src, stride);
+
+ stride /= sizeof(*dst);
+
+ for (int i = 0; i < len4; i++) {
+ dst[ i*stride] = -dst[(len2 - i - 1)*stride];
+ dst[(len - i - 1)*stride] = dst[(len2 + i + 0)*stride];
+ }
+}
+
static int gen_mdct_exptab(AVTXContext *s, int len4, double scale)
{
const double theta = (scale < 0 ? len4 : 0) + 1.0/8.0;
SRC /= FACTOR; \
}
CHECK_FACTOR(n, 15, len)
+ CHECK_FACTOR(n, 9, len)
+ CHECK_FACTOR(n, 7, len)
CHECK_FACTOR(n, 5, len)
CHECK_FACTOR(n, 3, len)
#undef CHECK_FACTOR
if (is_mdct) {
s->scale = *((SCALE_TYPE *)scale);
*tx = inv ? naive_imdct : naive_mdct;
+ if (inv && (flags & AV_TX_FULL_IMDCT)) {
+ s->top_tx = *tx;
+ *tx = full_imdct_wrapper_fn;
+ }
}
return 0;
}
return err;
if (!(s->tmp = av_malloc(n*m*sizeof(*s->tmp))))
return AVERROR(ENOMEM);
- *tx = n == 3 ? compound_fft_3xM :
- n == 5 ? compound_fft_5xM :
- compound_fft_15xM;
- if (is_mdct)
- *tx = n == 3 ? inv ? compound_imdct_3xM : compound_mdct_3xM :
- n == 5 ? inv ? compound_imdct_5xM : compound_mdct_5xM :
- inv ? compound_imdct_15xM : compound_mdct_15xM;
+ if (!(m & (m - 1))) {
+ *tx = n == 3 ? compound_fft_3xM :
+ n == 5 ? compound_fft_5xM :
+ n == 7 ? compound_fft_7xM :
+ n == 9 ? compound_fft_9xM :
+ compound_fft_15xM;
+ if (is_mdct)
+ *tx = n == 3 ? inv ? compound_imdct_3xM : compound_mdct_3xM :
+ n == 5 ? inv ? compound_imdct_5xM : compound_mdct_5xM :
+ n == 7 ? inv ? compound_imdct_7xM : compound_mdct_7xM :
+ n == 9 ? inv ? compound_imdct_9xM : compound_mdct_9xM :
+ inv ? compound_imdct_15xM : compound_mdct_15xM;
+ }
} else { /* Direct transform case */
- *tx = monolithic_fft;
+ *tx = split_radix_fft;
if (is_mdct)
*tx = inv ? monolithic_imdct : monolithic_mdct;
}
- if (n != 1)
+ if (n == 3 || n == 5 || n == 15)
init_cos_tabs(0);
- if (m != 1) {
- if ((err = ff_tx_gen_ptwo_revtab(s)))
+ else if (n == 7)
+ init_cos_tabs(1);
+ else if (n == 9)
+ init_cos_tabs(2);
+
+ if (m != 1 && !(m & (m - 1))) {
+ if ((err = ff_tx_gen_ptwo_revtab(s, n == 1 && !is_mdct && !(flags & AV_TX_INPLACE))))
return err;
if (flags & AV_TX_INPLACE) {
if (is_mdct) /* In-place MDCTs are not supported yet */
return AVERROR(ENOSYS);
- if ((err = ff_tx_gen_ptwo_inplace_revtab_idx(s)))
+ if ((err = ff_tx_gen_ptwo_inplace_revtab_idx(s, s->revtab_c)))
return err;
}
for (int i = 4; i <= av_log2(m); i++)
init_cos_tabs(i);
}
- if (is_mdct)
+ if (is_mdct) {
+ if (inv && (flags & AV_TX_FULL_IMDCT)) {
+ s->top_tx = *tx;
+ *tx = full_imdct_wrapper_fn;
+ }
return gen_mdct_exptab(s, n*m, *((SCALE_TYPE *)scale));
+ }
return 0;
}