[xiph-commits] r8636 - in trunk/speex: libspeex symbian

[conrad at motherfish-iii.xiph.org]

Author: conrad
Date: 2005-01-05 17:52:49 -0800 (Wed, 05 Jan 2005)
New Revision: 8636

Modified:
   trunk/speex/libspeex/arch.h
   trunk/speex/libspeex/nb_celp.c
   trunk/speex/symbian/config.h
Log:
applied symbian related config and casting diffs from Colin Ward


Modified: trunk/speex/libspeex/arch.h
===================================================================
--- trunk/speex/libspeex/arch.h	2005-01-06 01:06:05 UTC (rev 8635)
+++ trunk/speex/libspeex/arch.h	2005-01-06 01:52:49 UTC (rev 8636)
@@ -41,7 +41,11 @@
 
 typedef signed short spx_word16_t;
 typedef signed int   spx_word32_t;
+#ifdef _MSC_VER
+typedef __int64      spx_word64_t;
+#else
 typedef long long    spx_word64_t;
+#endif
 typedef spx_word32_t spx_mem_t;
 typedef spx_word16_t spx_coef_t;
 typedef spx_word16_t spx_lsp_t;

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2005-01-06 01:06:05 UTC (rev 8635)
+++ trunk/speex/libspeex/nb_celp.c	2005-01-06 01:52:49 UTC (rev 8636)
@@ -872,7 +872,7 @@
             SUBMODE(innovation_quant)(target, st->interp_qlpc, st->bw_lpc1, st->bw_lpc2, 
                                       SUBMODE(innovation_params), st->lpcSize, st->subframeSize, 
                                       innov2, syn_resp, bits, tmp_stack, st->complexity);
-            signal_mul(innov2, innov2, ener*(1/2.2), st->subframeSize);
+            signal_mul(innov2, innov2, (spx_word32_t) (ener*(1/2.2)), st->subframeSize);
             for (i=0;i<st->subframeSize;i++)
                exc[i] += innov2[i];
          }
@@ -1596,7 +1596,7 @@
             for (i=0;i<st->subframeSize;i++)
                innov2[i]=0;
             SUBMODE(innovation_unquant)(innov2, SUBMODE(innovation_params), st->subframeSize, bits, tmp_stack);
-            signal_mul(innov2, innov2, ener*(1/2.2), st->subframeSize);
+            signal_mul(innov2, innov2, (spx_word32_t) (ener*(1/2.2)), st->subframeSize);
             for (i=0;i<st->subframeSize;i++)
                exc[i] += innov2[i];
          }

Modified: trunk/speex/symbian/config.h
===================================================================
--- trunk/speex/symbian/config.h	2005-01-06 01:06:05 UTC (rev 8635)
+++ trunk/speex/symbian/config.h	2005-01-06 01:52:49 UTC (rev 8636)
@@ -48,12 +48,10 @@
 #pragma warning(disable: 4244) /* conversion from '...' to '...', possible loss of data */
 #pragma warning(disable: 4701) /* local variable may be be used without having been initialized */
 
-#else /* ! __WINS__ */
+#endif /* ! __WINS__ */
 
-/* Use only fixed point arithmetic when decoding on a device */
+/* Use only fixed point arithmetic */
 
 #define FIXED_POINT 1
 
-#endif /* ! __WINS__ */
-
 #endif /* ! CONFIG_H */