diff options
Diffstat (limited to 'apps/codecs/libspeex/nb_celp.c')
-rw-r--r-- | apps/codecs/libspeex/nb_celp.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/apps/codecs/libspeex/nb_celp.c b/apps/codecs/libspeex/nb_celp.c index 6047bd42aa..0798ffbcf4 100644 --- a/apps/codecs/libspeex/nb_celp.c +++ b/apps/codecs/libspeex/nb_celp.c | |||
@@ -108,8 +108,8 @@ const float exc_gain_quant_scal1[2]={0.70469f, 1.05127f}; | |||
108 | #define sqr(x) ((x)*(x)) | 108 | #define sqr(x) ((x)*(x)) |
109 | 109 | ||
110 | extern const spx_word16_t lpc_window[]; | 110 | extern const spx_word16_t lpc_window[]; |
111 | 111 | #if 0 | |
112 | void *nb_encoder_init(const SpeexMode *m) | 112 | void *nb_encoder_init(const speexmode *m) |
113 | { | 113 | { |
114 | EncState *st; | 114 | EncState *st; |
115 | const SpeexNBMode *mode; | 115 | const SpeexNBMode *mode; |
@@ -1023,6 +1023,19 @@ int nb_encode(void *state, void *vin, SpeexBits *bits) | |||
1023 | 1023 | ||
1024 | return 1; | 1024 | return 1; |
1025 | } | 1025 | } |
1026 | #else | ||
1027 | void *nb_encoder_init(const SpeexMode *m) | ||
1028 | { | ||
1029 | return NULL; | ||
1030 | } | ||
1031 | void nb_encoder_destroy(void *state) | ||
1032 | { | ||
1033 | } | ||
1034 | int nb_encode(void *state, void *vin, SpeexBits *bits) | ||
1035 | { | ||
1036 | return 1; | ||
1037 | } | ||
1038 | #endif | ||
1026 | 1039 | ||
1027 | static DecState global_decstate IBSS_ATTR; | 1040 | static DecState global_decstate IBSS_ATTR; |
1028 | 1041 | ||
@@ -1033,9 +1046,11 @@ void *nb_decoder_init(const SpeexMode *m) | |||
1033 | int i; | 1046 | int i; |
1034 | 1047 | ||
1035 | mode=(const SpeexNBMode*)m->mode; | 1048 | mode=(const SpeexNBMode*)m->mode; |
1036 | /* st = (DecState *)speex_alloc(sizeof(DecState)); */ | 1049 | /* |
1050 | st = (DecState *)speex_alloc(sizeof(DecState)); | ||
1037 | if (!st) | 1051 | if (!st) |
1038 | return NULL; | 1052 | return NULL; |
1053 | */ | ||
1039 | #if defined(VAR_ARRAYS) || defined (USE_ALLOCA) | 1054 | #if defined(VAR_ARRAYS) || defined (USE_ALLOCA) |
1040 | st->stack = NULL; | 1055 | st->stack = NULL; |
1041 | #else | 1056 | #else |
@@ -1740,6 +1755,7 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) | |||
1740 | return 0; | 1755 | return 0; |
1741 | } | 1756 | } |
1742 | 1757 | ||
1758 | #if 0 | ||
1743 | int nb_encoder_ctl(void *state, int request, void *ptr) | 1759 | int nb_encoder_ctl(void *state, int request, void *ptr) |
1744 | { | 1760 | { |
1745 | EncState *st; | 1761 | EncState *st; |
@@ -1935,6 +1951,12 @@ int nb_encoder_ctl(void *state, int request, void *ptr) | |||
1935 | } | 1951 | } |
1936 | return 0; | 1952 | return 0; |
1937 | } | 1953 | } |
1954 | #else | ||
1955 | int nb_encoder_ctl(void *state, int request, void *ptr) | ||
1956 | { | ||
1957 | return 0; | ||
1958 | } | ||
1959 | #endif | ||
1938 | 1960 | ||
1939 | int nb_decoder_ctl(void *state, int request, void *ptr) | 1961 | int nb_decoder_ctl(void *state, int request, void *ptr) |
1940 | { | 1962 | { |