diff --git a/lib/rbcodec/codecs/libspeex/cb_search.c b/lib/rbcodec/codecs/libspeex/cb_search.c index 35fe3a2f67..3d8d926d67 100644 --- a/lib/rbcodec/codecs/libspeex/cb_search.c +++ b/lib/rbcodec/codecs/libspeex/cb_search.c @@ -53,6 +53,7 @@ #ifndef OVERRIDE_COMPUTE_WEIGHTED_CODEBOOK static void compute_weighted_codebook(const signed char *shape_cb, const spx_word16_t *r, spx_word16_t *resp, spx_word16_t *resp2, spx_word32_t *E, int shape_cb_size, int subvect_size, char *stack) { + (void)resp2; (void)stack; int i, j, k; VARDECL(spx_word16_t *shape); ALLOC(shape, subvect_size, spx_word16_t); @@ -590,6 +591,7 @@ int complexity, int update_target ) { + (void)par; (void)r; (void)bits; (void)complexity; (void)update_target; int i; VARDECL(spx_word16_t *tmp); ALLOC(tmp, nsf, spx_word16_t); diff --git a/lib/rbcodec/codecs/libspeex/filters.c b/lib/rbcodec/codecs/libspeex/filters.c index b6fb79c9e0..23fdabe319 100644 --- a/lib/rbcodec/codecs/libspeex/filters.c +++ b/lib/rbcodec/codecs/libspeex/filters.c @@ -334,6 +334,7 @@ spx_word16_t compute_rms16(const spx_word16_t *x, int len) #ifndef OVERRIDE_FILTER_MEM16 void filter_mem16(const spx_word16_t *x, const spx_coef_t *num, const spx_coef_t *den, spx_word16_t *y, int N, int ord, spx_mem_t *mem, char *stack) { + (void)stack; int i,j; spx_word16_t xi,yi,nyi; for (i=0;iden_rate;i++) { - spx_int32_t j; + spx_uint32_t j; for (j=0;jfilt_len;j++) { st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-(spx_int32_t)st->filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func); @@ -663,7 +663,8 @@ static void update_filter(SpeexResamplerState *st) } for (i=st->nb_channels-1;i>=0;i--) { - spx_int32_t j; + spx_uint32_t j; + spx_int32_t k; spx_uint32_t olen = old_length; /*if (st->magic_samples[i])*/ { @@ -671,8 +672,8 @@ static void update_filter(SpeexResamplerState *st) /* FIXME: This is wrong but for now we need it to avoid going over the array bounds */ olen = old_length + 2*st->magic_samples[i]; - for (j=old_length-2+st->magic_samples[i];j>=0;j--) - st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]] = st->mem[i*old_alloc_size+j]; + for (k=old_length-2+st->magic_samples[i];k>=0;k--) + st->mem[i*st->mem_alloc_size+k+st->magic_samples[i]] = st->mem[i*old_alloc_size+k]; for (j=0;jmagic_samples[i];j++) st->mem[i*st->mem_alloc_size+j] = 0; st->magic_samples[i] = 0; @@ -841,7 +842,7 @@ EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t cha EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len) #endif { - int j; + spx_uint32_t j; spx_uint32_t ilen = *in_len; spx_uint32_t olen = *out_len; spx_word16_t *x = st->mem + channel_index * st->mem_alloc_size; @@ -882,7 +883,7 @@ EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t c EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len) #endif { - int j; + spx_uint32_t j; const int istride_save = st->in_stride; const int ostride_save = st->out_stride; spx_uint32_t ilen = *in_len; diff --git a/lib/rbcodec/codecs/libspeex/vbr.c b/lib/rbcodec/codecs/libspeex/vbr.c index 32b33bc10e..72d7b80df6 100644 --- a/lib/rbcodec/codecs/libspeex/vbr.c +++ b/lib/rbcodec/codecs/libspeex/vbr.c @@ -123,10 +123,11 @@ void vbr_init(VBRState *vbr) float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float pitch_coef) { + (void)pitch; int i; float ener=0, ener1=0, ener2=0; float qual=7; - int va; + /* int va; */ float log_energy; float non_st=0; float voicing; @@ -159,7 +160,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p || (voicing<0 && non_st < .05)) { float tmp; - va = 0; + /* va = 0; */ vbr->consec_noise++; if (pow_ener > 3*vbr->noise_level) tmp = 3*vbr->noise_level; @@ -171,7 +172,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p vbr->noise_accum_count = .95*vbr->noise_accum_count + .05; } } else { - va = 1; + /* va = 1; */ vbr->consec_noise=0; } @@ -270,6 +271,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p void vbr_destroy(VBRState *vbr) { + (void)vbr; } #endif /* #ifndef DISABLE_VBR */ diff --git a/lib/rbcodec/codecs/libspeex/vq.c b/lib/rbcodec/codecs/libspeex/vq.c index fff470a588..b10cd19354 100644 --- a/lib/rbcodec/codecs/libspeex/vq.c +++ b/lib/rbcodec/codecs/libspeex/vq.c @@ -75,6 +75,7 @@ int scal_quant32(spx_word32_t in, const spx_word32_t *boundary, int entries) /*Finds the indices of the n-best entries in a codebook*/ void vq_nbest(spx_word16_t *in, const spx_word16_t *codebook, int len, int entries, spx_word32_t *E, int N, int *nbest, spx_word32_t *best_dist, char *stack) { + (void)stack; int i,j,k,used; used = 0; for (i=0;i