[xiph-commits] r11821 - in trunk/speex: . libspeex ti

[jm at svn.xiph.org]

Author: jm
Date: 2006-08-30 07:05:00 -0700 (Wed, 30 Aug 2006)
New Revision: 11821

Modified:
   trunk/speex/configure.ac
   trunk/speex/libspeex/nb_celp.c
   trunk/speex/libspeex/sb_celp.c
   trunk/speex/libspeex/testenc.c
   trunk/speex/libspeex/testenc_uwb.c
   trunk/speex/libspeex/testenc_wb.c
   trunk/speex/ti/testenc-TI-C5x.c
   trunk/speex/ti/testenc-TI-C64x.c
Log:
more replacements of int with spx_int32_t


Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/configure.ac	2006-08-30 14:05:00 UTC (rev 11821)
@@ -94,9 +94,9 @@
   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],

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/libspeex/nb_celp.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -1825,7 +1825,7 @@
       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 @@
       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 @@
       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);

Modified: trunk/speex/libspeex/sb_celp.c
===================================================================
--- trunk/speex/libspeex/sb_celp.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/libspeex/sb_celp.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -1418,7 +1418,7 @@
       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);

Modified: trunk/speex/libspeex/testenc.c
===================================================================
--- trunk/speex/libspeex/testenc.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/libspeex/testenc.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -29,7 +29,7 @@
    SpeexBits bits;
    spx_int32_t tmp;
    int bitCount=0;
-   int skip_group_delay;
+   spx_int32_t skip_group_delay;
    SpeexCallback callback;
 
    sigpow = 0;

Modified: trunk/speex/libspeex/testenc_uwb.c
===================================================================
--- trunk/speex/libspeex/testenc_uwb.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/libspeex/testenc_uwb.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -30,7 +30,7 @@
    SpeexBits bits;
    spx_int32_t tmp;
    int bitCount=0;
-   int skip_group_delay;
+   spx_int32_t skip_group_delay;
    SpeexCallback callback;
 
    sigpow = 0;

Modified: trunk/speex/libspeex/testenc_wb.c
===================================================================
--- trunk/speex/libspeex/testenc_wb.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/libspeex/testenc_wb.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -30,7 +30,7 @@
    SpeexBits bits;
    spx_int32_t tmp;
    int bitCount=0;
-   int skip_group_delay;
+   spx_int32_t skip_group_delay;
    SpeexCallback callback;
 
    sigpow = 0;

Modified: trunk/speex/ti/testenc-TI-C5x.c
===================================================================
--- trunk/speex/ti/testenc-TI-C5x.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/ti/testenc-TI-C5x.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -135,9 +135,9 @@
    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 

Modified: trunk/speex/ti/testenc-TI-C64x.c
===================================================================
--- trunk/speex/ti/testenc-TI-C64x.c	2006-08-30 10:43:35 UTC (rev 11820)
+++ trunk/speex/ti/testenc-TI-C64x.c	2006-08-30 14:05:00 UTC (rev 11821)
@@ -104,9 +104,9 @@
    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