summaryrefslogtreecommitdiff
path: root/apps/codecs/demac
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs/demac')
-rw-r--r--apps/codecs/demac/libdemac/entropy.c2
-rw-r--r--apps/codecs/demac/libdemac/predictor.c2
-rw-r--r--apps/codecs/demac/libdemac/vector_math32.h54
3 files changed, 1 insertions, 57 deletions
diff --git a/apps/codecs/demac/libdemac/entropy.c b/apps/codecs/demac/libdemac/entropy.c
index 2c60420250..76d977da82 100644
--- a/apps/codecs/demac/libdemac/entropy.c
+++ b/apps/codecs/demac/libdemac/entropy.c
@@ -2,7 +2,7 @@
2 2
3libdemac - A Monkey's Audio decoder 3libdemac - A Monkey's Audio decoder
4 4
5$Id:$ 5$Id$
6 6
7Copyright (C) Dave Chapman 2007 7Copyright (C) Dave Chapman 2007
8 8
diff --git a/apps/codecs/demac/libdemac/predictor.c b/apps/codecs/demac/libdemac/predictor.c
index 90f24e416b..efc334e858 100644
--- a/apps/codecs/demac/libdemac/predictor.c
+++ b/apps/codecs/demac/libdemac/predictor.c
@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
28#include "parser.h" 28#include "parser.h"
29#include "predictor.h" 29#include "predictor.h"
30 30
31#include "vector_math32.h"
32
33/* Return 0 if x is zero, -1 if x is positive, 1 if x is negative */ 31/* Return 0 if x is zero, -1 if x is positive, 1 if x is negative */
34#define SIGN(x) (x) ? (((x) > 0) ? -1 : 1) : 0 32#define SIGN(x) (x) ? (((x) > 0) ? -1 : 1) : 0
35 33
diff --git a/apps/codecs/demac/libdemac/vector_math32.h b/apps/codecs/demac/libdemac/vector_math32.h
deleted file mode 100644
index b32867ca5d..0000000000
--- a/apps/codecs/demac/libdemac/vector_math32.h
+++ /dev/null
@@ -1,54 +0,0 @@
1/*
2
3libdemac - A Monkey's Audio decoder
4
5$Id:$
6
7Copyright (C) Dave Chapman 2007
8
9This program is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2 of the License, or
12(at your option) any later version.
13
14This program is distributed in the hope that it will be useful,
15but WITHOUT ANY WARRANTY; without even the implied warranty of
16MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17GNU General Public License for more details.
18
19You should have received a copy of the GNU General Public License
20along with this program; if not, write to the Free Software
21Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
22
23*/
24
25/* 32-bit vector math functions */
26
27#define scalarproduct4_rev32(x,y) ((x[0] * y[0]) + (x[1] * y[-1]) + \
28 (x[2] * y[-2]) + (x[3] * y[-3]))
29
30#define scalarproduct5_rev32(x,y) ((x[0] * y[0]) + (x[1] * y[-1]) + \
31 (x[2] * y[-2]) + (x[3] * y[-3]) + \
32 (x[4] * y[-4]))
33
34#define vector_sub4_rev32(x, y) { x[0] -= y[0]; \
35 x[1] -= y[-1]; \
36 x[2] -= y[-2]; \
37 x[3] -= y[-3]; }
38
39#define vector_sub5_rev32(x, y) { x[0] -= y[0]; \
40 x[1] -= y[-1]; \
41 x[2] -= y[-2]; \
42 x[3] -= y[-3]; \
43 x[4] -= y[-4]; }
44
45#define vector_add4_rev32(x, y) { x[0] += y[0]; \
46 x[1] += y[-1]; \
47 x[2] += y[-2]; \
48 x[3] += y[-3]; }
49
50#define vector_add5_rev32(x, y) { x[0] += y[0]; \
51 x[1] += y[-1]; \
52 x[2] += y[-2]; \
53 x[3] += y[-3]; \
54 x[4] += y[-4]; }