aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2014-03-18 12:33:13 +0100
committerJanne Grunau <janne-libav@jannau.net>2014-03-18 13:08:00 +0100
commitd961a79eb07a8911540a0bd356d68ae0cf93c6a1 (patch)
tree8ce83e0ba921be493023b07fbd2ef79e8f7abd32 /libavcodec
parentc829b35c08ad8e1df45cca1cd12f084cf1183d07 (diff)
downloadffmpeg-d961a79eb07a8911540a0bd356d68ae0cf93c6a1.tar.gz
sbrdsp: move #if to disable all educational code
Avoids a warning of the unused function 'autocorrelate'.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/sbrdsp.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c
index 4d07af58f8..b7917dc9af 100644
--- a/libavcodec/sbrdsp.c
+++ b/libavcodec/sbrdsp.c
@@ -109,6 +109,11 @@ static void sbr_qmf_deint_bfly_c(float *v, const float *src0, const float *src1)
}
}
+
+#if 0
+ /* This code is slower because it multiplies memory accesses.
+ * It is left for educational purposes and because it may offer
+ * a better reference for writing arch-specific DSP functions. */
static av_always_inline void autocorrelate(const float x[40][2],
float phi[3][2][2], int lag)
{
@@ -137,14 +142,13 @@ static av_always_inline void autocorrelate(const float x[40][2],
static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
{
-#if 0
- /* This code is slower because it multiplies memory accesses.
- * It is left for educational purposes and because it may offer
- * a better reference for writing arch-specific DSP functions. */
autocorrelate(x, phi, 0);
autocorrelate(x, phi, 1);
autocorrelate(x, phi, 2);
+}
#else
+static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
+{
float real_sum2 = x[0][0] * x[2][0] + x[0][1] * x[2][1];
float imag_sum2 = x[0][0] * x[2][1] - x[0][1] * x[2][0];
float real_sum1 = 0.0f, imag_sum1 = 0.0f, real_sum0 = 0.0f;