Skip to content

Commit c73d2f3

Browse files
committed
Fix visual studio warnings for signed/unsigned comparison and unused variable
1 parent 74db0e5 commit c73d2f3

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

libspeexdsp/jitter.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ EXPORT void jitter_buffer_put(JitterBuffer *jitter, const JitterBufferPacket *pa
442442
jitter->packets[i].data = packet->data;
443443
} else {
444444
jitter->packets[i].data=(char*)speex_alloc(packet->len);
445-
for (j=0;j<packet->len;j++)
445+
for (j=0;j<(int)packet->len;j++)
446446
jitter->packets[i].data[j]=packet->data[j];
447447
}
448448
jitter->packets[i].timestamp=packet->timestamp;
@@ -689,7 +689,7 @@ EXPORT int jitter_buffer_get_another(JitterBuffer *jitter, JitterBufferPacket *p
689689
{
690690
packet->data = jitter->packets[i].data;
691691
} else {
692-
for (j=0;j<packet->len;j++)
692+
for (j=0;j<(int)packet->len;j++)
693693
packet->data[j] = jitter->packets[i].data[j];
694694
/* Remove packet */
695695
speex_free(jitter->packets[i].data);

libspeexdsp/resample.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -670,10 +670,10 @@ static int update_filter(SpeexResamplerState *st)
670670
spx_uint32_t i;
671671
for (i=0;i<st->den_rate;i++)
672672
{
673-
spx_int32_t j;
674-
for (j=0;j<st->filt_len;j++)
673+
spx_int32_t j, filt_len = (spx_int32_t)st->filt_len;
674+
for (j=0;j<filt_len;j++)
675675
{
676-
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);
676+
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);
677677
}
678678
}
679679
#ifdef FIXED_POINT
@@ -927,7 +927,7 @@ EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t cha
927927
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)
928928
#endif
929929
{
930-
int j;
930+
spx_uint32_t j;
931931
spx_uint32_t ilen = *in_len;
932932
spx_uint32_t olen = *out_len;
933933
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
968968
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)
969969
#endif
970970
{
971-
int j;
971+
spx_uint32_t j;
972972
const int istride_save = st->in_stride;
973973
const int ostride_save = st->out_stride;
974974
spx_uint32_t ilen = *in_len;

libspeexdsp/resample_sse.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static inline float inner_product_single(const float *a, const float *b, unsigne
4242
int i;
4343
float ret;
4444
__m128 sum = _mm_setzero_ps();
45-
for (i=0;i<len;i+=8)
45+
for (i=0;i<(int)len;i+=8)
4646
{
4747
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_loadu_ps(a+i), _mm_loadu_ps(b+i)));
4848
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_loadu_ps(a+i+4), _mm_loadu_ps(b+i+4)));
@@ -59,7 +59,7 @@ static inline float interpolate_product_single(const float *a, const float *b, u
5959
float ret;
6060
__m128 sum = _mm_setzero_ps();
6161
__m128 f = _mm_loadu_ps(frac);
62-
for(i=0;i<len;i+=2)
62+
for(i=0;i<(int)len;i+=2)
6363
{
6464
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_load1_ps(a+i), _mm_loadu_ps(b+i*oversample)));
6565
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_load1_ps(a+i+1), _mm_loadu_ps(b+(i+1)*oversample)));
@@ -81,7 +81,7 @@ static inline double inner_product_double(const float *a, const float *b, unsign
8181
double ret;
8282
__m128d sum = _mm_setzero_pd();
8383
__m128 t;
84-
for (i=0;i<len;i+=8)
84+
for (i=0;i<(int)len;i+=8)
8585
{
8686
t = _mm_mul_ps(_mm_loadu_ps(a+i), _mm_loadu_ps(b+i));
8787
sum = _mm_add_pd(sum, _mm_cvtps_pd(t));
@@ -107,7 +107,7 @@ static inline double interpolate_product_double(const float *a, const float *b,
107107
__m128d f1 = _mm_cvtps_pd(f);
108108
__m128d f2 = _mm_cvtps_pd(_mm_movehl_ps(f,f));
109109
__m128 t;
110-
for(i=0;i<len;i+=2)
110+
for(i=0;i<(int)len;i+=2)
111111
{
112112
t = _mm_mul_ps(_mm_load1_ps(a+i), _mm_loadu_ps(b+i*oversample));
113113
sum1 = _mm_add_pd(sum1, _mm_cvtps_pd(t));

libspeexdsp/testjitter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void jitterFill(JitterBuffer *jb) {
3939
if (jitter_buffer_get(jb, &out, 10, NULL) != JITTER_BUFFER_OK) {
4040
printf("Fill test failed iteration %d\n", i);
4141
}
42-
if (out.timestamp != i * 10) {
42+
if (out.timestamp != (unsigned int)i * 10) {
4343
printf("Fill test expected %d got %d\n", i*10, out.timestamp);
4444
}
4545
jitter_buffer_tick(jb);

0 commit comments

Comments
 (0)