summaryrefslogtreecommitdiff
path: root/apps/codecs/libspeex/speex.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2007-10-26 01:16:55 +0000
committerThom Johansen <thomj@rockbox.org>2007-10-26 01:16:55 +0000
commitfa971b142d794c9620b823d6b9d1937397c1f1e1 (patch)
tree55565a0765c15be5d1df4cfb1c04dc92de50fe5d /apps/codecs/libspeex/speex.c
parent14da611cd32d084813bb0d2e2318b81c3ea2953a (diff)
downloadrockbox-fa971b142d794c9620b823d6b9d1937397c1f1e1.tar.gz
rockbox-fa971b142d794c9620b823d6b9d1937397c1f1e1.zip
Sync with Speex SVN. Syntactic change in filters_cf.S.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15310 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/speex.c')
-rw-r--r--apps/codecs/libspeex/speex.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/apps/codecs/libspeex/speex.c b/apps/codecs/libspeex/speex.c
index 17a987fde0..2a42e274a7 100644
--- a/apps/codecs/libspeex/speex.c
+++ b/apps/codecs/libspeex/speex.c
@@ -38,6 +38,7 @@
38 38
39#include "modes.h" 39#include "modes.h"
40#include <math.h> 40#include <math.h>
41#include "os_support.h"
41 42
42#ifndef NULL 43#ifndef NULL
43#define NULL 0 44#define NULL 0
@@ -208,29 +209,6 @@ int nb_mode_query(const void *mode, int request, void *ptr)
208 return 0; 209 return 0;
209} 210}
210 211
211int wb_mode_query(const void *mode, int request, void *ptr)
212{
213 const SpeexSBMode *m = (const SpeexSBMode*)mode;
214
215 switch (request)
216 {
217 case SPEEX_MODE_FRAME_SIZE:
218 *((int*)ptr)=2*m->frameSize;
219 break;
220 case SPEEX_SUBMODE_BITS_PER_FRAME:
221 if (*((int*)ptr)==0)
222 *((int*)ptr) = SB_SUBMODE_BITS+1;
223 else if (m->submodes[*((int*)ptr)]==NULL)
224 *((int*)ptr) = -1;
225 else
226 *((int*)ptr) = m->submodes[*((int*)ptr)]->bits_per_frame;
227 break;
228 default:
229 speex_warning_int("Unknown wb_mode_query request: ", request);
230 return -1;
231 }
232 return 0;
233}
234 212
235 213
236int speex_lib_ctl(int request, void *ptr) 214int speex_lib_ctl(int request, void *ptr)