diff --git a/libspeexdsp/jitter.c b/libspeexdsp/jitter.c index a9c0dd31..bfd955f0 100644 --- a/libspeexdsp/jitter.c +++ b/libspeexdsp/jitter.c @@ -442,7 +442,7 @@ EXPORT void jitter_buffer_put(JitterBuffer *jitter, const JitterBufferPacket *pa jitter->packets[i].data = packet->data; } else { jitter->packets[i].data=(char*)speex_alloc(packet->len); - for (j=0;jlen;j++) + for (j=0;j<(int)packet->len;j++) jitter->packets[i].data[j]=packet->data[j]; } jitter->packets[i].timestamp=packet->timestamp; @@ -689,7 +689,7 @@ EXPORT int jitter_buffer_get_another(JitterBuffer *jitter, JitterBufferPacket *p { packet->data = jitter->packets[i].data; } else { - for (j=0;jlen;j++) + for (j=0;j<(int)packet->len;j++) packet->data[j] = jitter->packets[i].data[j]; /* Remove packet */ speex_free(jitter->packets[i].data); diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c index cd2477b0..f2d76034 100644 --- a/libspeexdsp/resample.c +++ b/libspeexdsp/resample.c @@ -670,10 +670,10 @@ static int update_filter(SpeexResamplerState *st) spx_uint32_t i; for (i=0;iden_rate;i++) { - spx_int32_t j; - for (j=0;jfilt_len;j++) + spx_int32_t j, filt_len = (spx_int32_t)st->filt_len; + for (j=0;jsinc_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); + st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func); } } #ifdef FIXED_POINT @@ -927,7 +927,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; @@ -968,7 +968,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/libspeexdsp/resample_sse.h b/libspeexdsp/resample_sse.h index 00dc2946..848b5e76 100644 --- a/libspeexdsp/resample_sse.h +++ b/libspeexdsp/resample_sse.h @@ -42,7 +42,7 @@ static inline float inner_product_single(const float *a, const float *b, unsigne int i; float ret; __m128 sum = _mm_setzero_ps(); - for (i=0;i