diff options
Diffstat (limited to 'apps/codecs/libspeex/speex_callbacks.c')
-rw-r--r-- | apps/codecs/libspeex/speex_callbacks.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/apps/codecs/libspeex/speex_callbacks.c b/apps/codecs/libspeex/speex_callbacks.c index 58d7b7b92a..9ffe5245f1 100644 --- a/apps/codecs/libspeex/speex_callbacks.c +++ b/apps/codecs/libspeex/speex_callbacks.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "config-speex.h" | 36 | #include "config-speex.h" |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #include <speex/speex_callbacks.h> | 39 | #include "speex/speex_callbacks.h" |
40 | #include "arch.h" | 40 | #include "arch.h" |
41 | #include "os_support.h" | 41 | #include "os_support.h" |
42 | 42 | ||
@@ -74,6 +74,7 @@ int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *st | |||
74 | 74 | ||
75 | int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data) | 75 | int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data) |
76 | { | 76 | { |
77 | (void)state; | ||
77 | spx_int32_t m; | 78 | spx_int32_t m; |
78 | m = speex_bits_unpack_unsigned(bits, 4); | 79 | m = speex_bits_unpack_unsigned(bits, 4); |
79 | speex_encoder_ctl(data, SPEEX_SET_MODE, &m); | 80 | speex_encoder_ctl(data, SPEEX_SET_MODE, &m); |
@@ -82,6 +83,7 @@ int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data) | |||
82 | 83 | ||
83 | int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data) | 84 | int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data) |
84 | { | 85 | { |
86 | (void)state; | ||
85 | spx_int32_t m; | 87 | spx_int32_t m; |
86 | m = speex_bits_unpack_unsigned(bits, 4); | 88 | m = speex_bits_unpack_unsigned(bits, 4); |
87 | speex_encoder_ctl(data, SPEEX_SET_LOW_MODE, &m); | 89 | speex_encoder_ctl(data, SPEEX_SET_LOW_MODE, &m); |
@@ -90,6 +92,7 @@ int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data) | |||
90 | 92 | ||
91 | int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data) | 93 | int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data) |
92 | { | 94 | { |
95 | (void)state; | ||
93 | spx_int32_t m; | 96 | spx_int32_t m; |
94 | m = speex_bits_unpack_unsigned(bits, 4); | 97 | m = speex_bits_unpack_unsigned(bits, 4); |
95 | speex_encoder_ctl(data, SPEEX_SET_HIGH_MODE, &m); | 98 | speex_encoder_ctl(data, SPEEX_SET_HIGH_MODE, &m); |
@@ -99,6 +102,7 @@ int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data | |||
99 | #ifndef DISABLE_VBR | 102 | #ifndef DISABLE_VBR |
100 | int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data) | 103 | int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data) |
101 | { | 104 | { |
105 | (void)state; | ||
102 | spx_int32_t vbr; | 106 | spx_int32_t vbr; |
103 | vbr = speex_bits_unpack_unsigned(bits, 1); | 107 | vbr = speex_bits_unpack_unsigned(bits, 1); |
104 | speex_encoder_ctl(data, SPEEX_SET_VBR, &vbr); | 108 | speex_encoder_ctl(data, SPEEX_SET_VBR, &vbr); |
@@ -108,6 +112,7 @@ int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data) | |||
108 | 112 | ||
109 | int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data) | 113 | int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data) |
110 | { | 114 | { |
115 | (void)state; | ||
111 | spx_int32_t enh; | 116 | spx_int32_t enh; |
112 | enh = speex_bits_unpack_unsigned(bits, 1); | 117 | enh = speex_bits_unpack_unsigned(bits, 1); |
113 | speex_decoder_ctl(data, SPEEX_SET_ENH, &enh); | 118 | speex_decoder_ctl(data, SPEEX_SET_ENH, &enh); |
@@ -117,6 +122,7 @@ int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data) | |||
117 | #ifndef DISABLE_VBR | 122 | #ifndef DISABLE_VBR |
118 | int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *data) | 123 | int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *data) |
119 | { | 124 | { |
125 | (void)state; | ||
120 | float qual; | 126 | float qual; |
121 | qual = speex_bits_unpack_unsigned(bits, 4); | 127 | qual = speex_bits_unpack_unsigned(bits, 4); |
122 | speex_encoder_ctl(data, SPEEX_SET_VBR_QUALITY, &qual); | 128 | speex_encoder_ctl(data, SPEEX_SET_VBR_QUALITY, &qual); |
@@ -126,6 +132,7 @@ int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *da | |||
126 | 132 | ||
127 | int speex_std_char_handler(SpeexBits *bits, void *state, void *data) | 133 | int speex_std_char_handler(SpeexBits *bits, void *state, void *data) |
128 | { | 134 | { |
135 | (void)state; | ||
129 | unsigned char ch; | 136 | unsigned char ch; |
130 | ch = speex_bits_unpack_unsigned(bits, 8); | 137 | ch = speex_bits_unpack_unsigned(bits, 8); |
131 | _speex_putc(ch, data); | 138 | _speex_putc(ch, data); |
@@ -133,11 +140,11 @@ int speex_std_char_handler(SpeexBits *bits, void *state, void *data) | |||
133 | return 0; | 140 | return 0; |
134 | } | 141 | } |
135 | 142 | ||
136 | |||
137 | |||
138 | /* Default handler for user callbacks: skip it */ | 143 | /* Default handler for user callbacks: skip it */ |
139 | int speex_default_user_handler(SpeexBits *bits, void *state, void *data) | 144 | int speex_default_user_handler(SpeexBits *bits, void *state, void *data) |
140 | { | 145 | { |
146 | (void)state; | ||
147 | (void)data; | ||
141 | int req_size = speex_bits_unpack_unsigned(bits, 4); | 148 | int req_size = speex_bits_unpack_unsigned(bits, 4); |
142 | speex_bits_advance(bits, 5+8*req_size); | 149 | speex_bits_advance(bits, 5+8*req_size); |
143 | return 0; | 150 | return 0; |