ref: 2de66199b2fc6ac8966d624bd8ab4c325d66ba8a
parent: 2dc4b2d93f98e2001b4a783257dc334d6e74ea30
author: Jean-Marc Valin <[email protected]>
date: Mon May 5 12:05:34 EDT 2008
Disabled pulse spreading until I can show it actually helps
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -42,6 +42,7 @@
#include "os_support.h"
#include "mathops.h"
+#if 0
void exp_rotation(celt_norm_t *X, int len, int dir, int stride, int iter)
{int i, k;
@@ -74,9 +75,9 @@
}
}
}
+#endif
-
const celt_word16_t sqrtC_1[2] = {QCONST16(1.f, 14), QCONST16(1.414214f, 14)};#ifdef FIXED_POINT
@@ -336,15 +337,15 @@
if (q > 0)
{- int nb_rotations = q <= 2*C ? 2*C/q : 0;
+ /*int nb_rotations = q <= 2*C ? 2*C/q : 0;
if (nb_rotations != 0)
{exp_rotation(P+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);
exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);
- }
+ }*/
alg_quant(X+C*eBands[i], W+C*eBands[i], C*(eBands[i+1]-eBands[i]), q, P+C*eBands[i], enc);
- if (nb_rotations != 0)
- exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), 1, C, nb_rotations);
+ /*if (nb_rotations != 0)
+ exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), 1, C, nb_rotations);*/
}
for (j=C*eBands[i];j<C*eBands[i+1];j++)
norm[j] = MULT16_16_Q15(n,X[j]);
@@ -394,12 +395,12 @@
if (q > 0)
{- int nb_rotations = q <= 2*C ? 2*C/q : 0;
+ /*int nb_rotations = q <= 2*C ? 2*C/q : 0;
if (nb_rotations != 0)
- exp_rotation(P+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);
+ exp_rotation(P+C*eBands[i], C*(eBands[i+1]-eBands[i]), -1, C, nb_rotations);*/
alg_unquant(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), q, P+C*eBands[i], dec);
- if (nb_rotations != 0)
- exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), 1, C, nb_rotations);
+ /*if (nb_rotations != 0)
+ exp_rotation(X+C*eBands[i], C*(eBands[i+1]-eBands[i]), 1, C, nb_rotations);*/
}
for (j=C*eBands[i];j<C*eBands[i+1];j++)
norm[j] = MULT16_16_Q15(n,X[j]);
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,9 @@
INCLUDES = -I$(top_srcdir)/libcelt
METASOURCES = AUTO
-TESTS = type-test ectest cwrs32-test cwrs64-test real-fft-test dft-test laplace-test mdct-test rotation-test mathops-test
+TESTS = type-test ectest cwrs32-test cwrs64-test real-fft-test dft-test laplace-test mdct-test mathops-test
-noinst_PROGRAMS = type-test ectest cwrs32-test cwrs64-test real-fft-test dft-test laplace-test mdct-test rotation-test mathops-test
+noinst_PROGRAMS = type-test ectest cwrs32-test cwrs64-test real-fft-test dft-test laplace-test mdct-test mathops-test
type_test_SOURCES = type-test.c
ectest_SOURCES = ectest.c
@@ -13,8 +13,8 @@
dft_test_SOURCES = dft-test.c
laplace_test_SOURCES = laplace-test.c
mdct_test_SOURCES = mdct-test.c
-rotation_test_SOURCES = rotation-test.c
+#rotation_test_SOURCES = rotation-test.c
mathops_test_SOURCES = mathops-test.c
-LDFLAGS = -static
+AM_LDFLAGS = -static
LDADD = $(top_builddir)/libcelt/libcelt.la