diff options
author | Sean Bartell <wingedtachikoma@gmail.com> | 2011-10-30 12:05:04 -0400 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2012-05-03 14:49:35 +0200 |
commit | cadb3627fcc32cec3a97183c0a1462fe0ff04755 (patch) | |
tree | ed3ec41d5231a604a7c3d368dbf8172d9ab1ea0a /lib/rbcodec/codecs/libspeex | |
parent | 5f0cb713615c844d9133f3664333a73816bbfd17 (diff) | |
download | rockbox-cadb3627fcc32cec3a97183c0a1462fe0ff04755.tar.gz rockbox-cadb3627fcc32cec3a97183c0a1462fe0ff04755.zip |
Add rbcodecplatform.h and rbcodecconfig.h.
librbcodec users must provide these two files when the library is built.
rbcodecconfig.h provides configuration #defines and basic types, and
will be included by public librbcodec headers, so it must not conflict
with the user's code. rbcodecplatform.h provides various OS functions,
and will only be included by source files and private headers. This
system is intended to provide maximum flexibility for use on embedded
systems, where no operating system headers are included. Unix systems
can just copy rbcodecconfig-example.h and rbcodecplatform-unix.h with
minimal changes.
Change-Id: I350a2274d173da391fd1ca00c4202e9760d91def
Reviewed-on: http://gerrit.rockbox.org/143
Reviewed-by: Nils Wallménius <nils@rockbox.org>
Tested-by: Nils Wallménius <nils@rockbox.org>
Diffstat (limited to 'lib/rbcodec/codecs/libspeex')
-rw-r--r-- | lib/rbcodec/codecs/libspeex/filters.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/lsp.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/ltp.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/modes.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/modes_wb.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/nb_celp.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/quant_lsp.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/sb_celp.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/speex.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/stereo.c | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/lib/rbcodec/codecs/libspeex/filters.c b/lib/rbcodec/codecs/libspeex/filters.c index 09f93c2a59..7c4c90a636 100644 --- a/lib/rbcodec/codecs/libspeex/filters.c +++ b/lib/rbcodec/codecs/libspeex/filters.c | |||
@@ -39,7 +39,9 @@ | |||
39 | #include "arch.h" | 39 | #include "arch.h" |
40 | #include "math_approx.h" | 40 | #include "math_approx.h" |
41 | #include "ltp.h" | 41 | #include "ltp.h" |
42 | #ifndef FIXED_POINT | ||
42 | #include <math.h> | 43 | #include <math.h> |
44 | #endif | ||
43 | 45 | ||
44 | #ifdef _USE_SSE | 46 | #ifdef _USE_SSE |
45 | #include "filters_sse.h" | 47 | #include "filters_sse.h" |
diff --git a/lib/rbcodec/codecs/libspeex/lsp.c b/lib/rbcodec/codecs/libspeex/lsp.c index 8408d782aa..83365a8639 100644 --- a/lib/rbcodec/codecs/libspeex/lsp.c +++ b/lib/rbcodec/codecs/libspeex/lsp.c | |||
@@ -83,7 +83,9 @@ Heavily modified by Jean-Marc Valin (c) 2002-2006 (fixed-point, | |||
83 | #include "config-speex.h" | 83 | #include "config-speex.h" |
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | #ifndef FIXED_POINT | ||
86 | #include <math.h> | 87 | #include <math.h> |
88 | #endif | ||
87 | #include "lsp.h" | 89 | #include "lsp.h" |
88 | #include "stack_alloc.h" | 90 | #include "stack_alloc.h" |
89 | #include "math_approx.h" | 91 | #include "math_approx.h" |
diff --git a/lib/rbcodec/codecs/libspeex/ltp.c b/lib/rbcodec/codecs/libspeex/ltp.c index 9f10bc09d8..c81e8eb2f3 100644 --- a/lib/rbcodec/codecs/libspeex/ltp.c +++ b/lib/rbcodec/codecs/libspeex/ltp.c | |||
@@ -34,7 +34,9 @@ | |||
34 | #include "config-speex.h" | 34 | #include "config-speex.h" |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #ifndef FIXED_POINT | ||
37 | #include <math.h> | 38 | #include <math.h> |
39 | #endif | ||
38 | #include "ltp.h" | 40 | #include "ltp.h" |
39 | #include "stack_alloc.h" | 41 | #include "stack_alloc.h" |
40 | #include "filters.h" | 42 | #include "filters.h" |
diff --git a/lib/rbcodec/codecs/libspeex/modes.c b/lib/rbcodec/codecs/libspeex/modes.c index d1046f1cfb..a58c0786dd 100644 --- a/lib/rbcodec/codecs/libspeex/modes.c +++ b/lib/rbcodec/codecs/libspeex/modes.c | |||
@@ -44,7 +44,9 @@ | |||
44 | #include "nb_celp.h" | 44 | #include "nb_celp.h" |
45 | #include "vbr.h" | 45 | #include "vbr.h" |
46 | #include "arch.h" | 46 | #include "arch.h" |
47 | #ifndef FIXED_POINT | ||
47 | #include <math.h> | 48 | #include <math.h> |
49 | #endif | ||
48 | 50 | ||
49 | #ifndef NULL | 51 | #ifndef NULL |
50 | #define NULL 0 | 52 | #define NULL 0 |
diff --git a/lib/rbcodec/codecs/libspeex/modes_wb.c b/lib/rbcodec/codecs/libspeex/modes_wb.c index 93922afa2f..4055a2b074 100644 --- a/lib/rbcodec/codecs/libspeex/modes_wb.c +++ b/lib/rbcodec/codecs/libspeex/modes_wb.c | |||
@@ -44,7 +44,9 @@ | |||
44 | #include "nb_celp.h" | 44 | #include "nb_celp.h" |
45 | #include "vbr.h" | 45 | #include "vbr.h" |
46 | #include "arch.h" | 46 | #include "arch.h" |
47 | #ifndef FIXED_POINT | ||
47 | #include <math.h> | 48 | #include <math.h> |
49 | #endif | ||
48 | #include "os_support.h" | 50 | #include "os_support.h" |
49 | 51 | ||
50 | 52 | ||
diff --git a/lib/rbcodec/codecs/libspeex/nb_celp.c b/lib/rbcodec/codecs/libspeex/nb_celp.c index 364f987472..a385500f90 100644 --- a/lib/rbcodec/codecs/libspeex/nb_celp.c +++ b/lib/rbcodec/codecs/libspeex/nb_celp.c | |||
@@ -33,7 +33,9 @@ | |||
33 | #include "config-speex.h" | 33 | #include "config-speex.h" |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifndef FIXED_POINT | ||
36 | #include <math.h> | 37 | #include <math.h> |
38 | #endif | ||
37 | #include "nb_celp.h" | 39 | #include "nb_celp.h" |
38 | #include "lpc.h" | 40 | #include "lpc.h" |
39 | #include "lsp.h" | 41 | #include "lsp.h" |
diff --git a/lib/rbcodec/codecs/libspeex/quant_lsp.c b/lib/rbcodec/codecs/libspeex/quant_lsp.c index 9b9104c842..c79942cd59 100644 --- a/lib/rbcodec/codecs/libspeex/quant_lsp.c +++ b/lib/rbcodec/codecs/libspeex/quant_lsp.c | |||
@@ -36,7 +36,9 @@ | |||
36 | 36 | ||
37 | #include "quant_lsp.h" | 37 | #include "quant_lsp.h" |
38 | #include "os_support.h" | 38 | #include "os_support.h" |
39 | #ifndef FIXED_POINT | ||
39 | #include <math.h> | 40 | #include <math.h> |
41 | #endif | ||
40 | #ifndef M_PI | 42 | #ifndef M_PI |
41 | #define M_PI 3.14159265358979323846 | 43 | #define M_PI 3.14159265358979323846 |
42 | #endif | 44 | #endif |
diff --git a/lib/rbcodec/codecs/libspeex/sb_celp.c b/lib/rbcodec/codecs/libspeex/sb_celp.c index b28744812f..45c8417022 100644 --- a/lib/rbcodec/codecs/libspeex/sb_celp.c +++ b/lib/rbcodec/codecs/libspeex/sb_celp.c | |||
@@ -33,7 +33,9 @@ | |||
33 | #include "config-speex.h" | 33 | #include "config-speex.h" |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifndef FIXED_POINT | ||
36 | #include <math.h> | 37 | #include <math.h> |
38 | #endif | ||
37 | #include "sb_celp.h" | 39 | #include "sb_celp.h" |
38 | #include "filters.h" | 40 | #include "filters.h" |
39 | #include "lpc.h" | 41 | #include "lpc.h" |
diff --git a/lib/rbcodec/codecs/libspeex/speex.c b/lib/rbcodec/codecs/libspeex/speex.c index 0dcfb3f7f6..92e41f52ae 100644 --- a/lib/rbcodec/codecs/libspeex/speex.c +++ b/lib/rbcodec/codecs/libspeex/speex.c | |||
@@ -37,7 +37,9 @@ | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #include "modes.h" | 39 | #include "modes.h" |
40 | #ifndef FIXED_POINT | ||
40 | #include <math.h> | 41 | #include <math.h> |
42 | #endif | ||
41 | #include "os_support.h" | 43 | #include "os_support.h" |
42 | 44 | ||
43 | #ifndef NULL | 45 | #ifndef NULL |
diff --git a/lib/rbcodec/codecs/libspeex/stereo.c b/lib/rbcodec/codecs/libspeex/stereo.c index 652d2a6e90..0aca1050fa 100644 --- a/lib/rbcodec/codecs/libspeex/stereo.c +++ b/lib/rbcodec/codecs/libspeex/stereo.c | |||
@@ -37,7 +37,9 @@ | |||
37 | #include "speex/speex_callbacks.h" | 37 | #include "speex/speex_callbacks.h" |
38 | #include "math_approx.h" | 38 | #include "math_approx.h" |
39 | #include "vq.h" | 39 | #include "vq.h" |
40 | #ifndef FIXED_POINT | ||
40 | #include <math.h> | 41 | #include <math.h> |
42 | #endif | ||
41 | #include "os_support.h" | 43 | #include "os_support.h" |
42 | 44 | ||
43 | typedef struct RealSpeexStereoState { | 45 | typedef struct RealSpeexStereoState { |