Commit 8157ec11 authored by jm's avatar jm
Browse files

more replacements of int with spx_int32_t


git-svn-id: http://svn.xiph.org/trunk/speex@11821 0101bb08-14d6-0310-b084-bc0e0c8e3800
parent a23f8009
......@@ -94,9 +94,9 @@ AC_ARG_ENABLE(wideband, [ --disable-wideband Disable wideband codec],
AC_DEFINE([DISABLE_WIDEBAND], , [Disable wideband codec])
fi])
AC_ARG_ENABLE(vorbis-psy, [ --enable-vorbis-psy Enable Vorbis-style psychoacoustics],
AC_ARG_ENABLE(vorbis-psy, [ --enable-vorbis-psy Enable Vorbis-style psychoacoustics (EXPERIMENTAL)],
[if test "$enableval" = yes; then
AC_DEFINE([VORBIS_PSYCHO], , [Enable Vorbis-style psychoacoustics])
AC_DEFINE([VORBIS_PSYCHO], , [Enable Vorbis-style psychoacoustics (EXPERIMENTAL)])
fi])
AC_ARG_ENABLE(valgrind, [ --enable-valgrind Enable valgrind extra checks],
......
......@@ -1825,7 +1825,7 @@ int nb_encoder_ctl(void *state, int request, void *ptr)
break;
case SPEEX_SET_QUALITY:
{
int quality = (*(int*)ptr);
int quality = (*(spx_int32_t*)ptr);
if (quality < 0)
quality = 0;
if (quality > 10)
......@@ -1937,7 +1937,7 @@ int nb_encoder_ctl(void *state, int request, void *ptr)
st->innov_save = (spx_sig_t*)ptr;
break;
case SPEEX_SET_WIDEBAND:
st->isWideband = *((int*)ptr);
st->isWideband = *((spx_int32_t*)ptr);
break;
default:
speex_warning_int("Unknown nb_ctl request: ", request);
......@@ -2045,7 +2045,7 @@ int nb_decoder_ctl(void *state, int request, void *ptr)
st->innov_save = (spx_sig_t*)ptr;
break;
case SPEEX_SET_WIDEBAND:
st->isWideband = *((int*)ptr);
st->isWideband = *((spx_int32_t*)ptr);
break;
default:
speex_warning_int("Unknown nb_ctl request: ", request);
......
......@@ -1418,7 +1418,7 @@ int sb_encoder_ctl(void *state, int request, void *ptr)
break;
case SPEEX_GET_LOOKAHEAD:
speex_encoder_ctl(st->st_low, SPEEX_GET_LOOKAHEAD, ptr);
(*(spx_int32_t*)ptr) = 2*(*(int*)ptr) + QMF_ORDER - 1;
(*(spx_int32_t*)ptr) = 2*(*(spx_int32_t*)ptr) + QMF_ORDER - 1;
break;
case SPEEX_SET_PLC_TUNING:
speex_encoder_ctl(st->st_low, SPEEX_SET_PLC_TUNING, ptr);
......
......@@ -29,7 +29,7 @@ int main(int argc, char **argv)
SpeexBits bits;
spx_int32_t tmp;
int bitCount=0;
int skip_group_delay;
spx_int32_t skip_group_delay;
SpeexCallback callback;
sigpow = 0;
......
......@@ -30,7 +30,7 @@ int main(int argc, char **argv)
SpeexBits bits;
spx_int32_t tmp;
int bitCount=0;
int skip_group_delay;
spx_int32_t skip_group_delay;
SpeexCallback callback;
sigpow = 0;
......
......@@ -30,7 +30,7 @@ int main(int argc, char **argv)
SpeexBits bits;
spx_int32_t tmp;
int bitCount=0;
int skip_group_delay;
spx_int32_t skip_group_delay;
SpeexCallback callback;
sigpow = 0;
......
......@@ -135,9 +135,9 @@ void main()
void *st;
void *dec;
SpeexBits bits;
int tmp;
spx_int32_t tmp;
unsigned long bitCount=0;
int skip_group_delay;
spx_int32_t skip_group_delay;
SpeexCallback callback;
/* C54xx defaults to max wait states, even for parts like C5416 with
......
......@@ -104,9 +104,9 @@ void main()
void *st;
void *dec;
SpeexBits bits;
int tmp;
spx_int32_t tmp;
unsigned long bitCount=0;
int skip_group_delay;
spx_int32_t skip_group_delay;
SpeexCallback callback;
#ifdef CHECK_RESULT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment