[xiph-commits] r11414 - in trunk/speex: . include/speex libspeex
jm at svn.xiph.org
jm at svn.xiph.org
Sat May 20 16:03:53 PDT 2006
Author: jm
Date: 2006-05-20 16:03:48 -0700 (Sat, 20 May 2006)
New Revision: 11414
Modified:
trunk/speex/configure.ac
trunk/speex/include/speex/speex_types.h
trunk/speex/libspeex/arch.h
trunk/speex/libspeex/fixed_generic.h
trunk/speex/libspeex/ltp.c
Log:
Got completely rid of the 64bit type (was only used in the adaptive codebook)
Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac 2006-05-20 19:29:37 UTC (rev 11413)
+++ trunk/speex/configure.ac 2006-05-20 23:03:48 UTC (rev 11414)
@@ -153,7 +153,6 @@
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
if test x$has_char16 = "xyes" ; then
case 1 in
Modified: trunk/speex/include/speex/speex_types.h
===================================================================
--- trunk/speex/include/speex/speex_types.h 2006-05-20 19:29:37 UTC (rev 11413)
+++ trunk/speex/include/speex/speex_types.h 2006-05-20 23:03:48 UTC (rev 11414)
@@ -26,7 +26,6 @@
# if defined(__CYGWIN__)
# include <_G_config.h>
- typedef _G_int64_t spx_int64_t;
typedef _G_int32_t spx_int32_t;
typedef _G_uint32_t spx_uint32_t;
typedef _G_int16_t spx_int16_t;
@@ -36,17 +35,13 @@
typedef unsigned short spx_uint16_t;
typedef int spx_int32_t;
typedef unsigned int spx_uint32_t;
- typedef long long spx_int64_t;
- typedef unsigned long long spx_uint64_t;
# elif defined(__MWERKS__)
- typedef long long spx_int64_t;
typedef int spx_int32_t;
typedef unsigned int spx_uint32_t;
typedef short spx_int16_t;
typedef unsigned short spx_uint16_t;
# else
/* MSVC/Borland */
- typedef __int64 spx_int64_t;
typedef __int32 spx_int32_t;
typedef unsigned __int32 spx_uint32_t;
typedef __int16 spx_int16_t;
@@ -60,7 +55,6 @@
typedef UInt16 spx_uint16_t;
typedef SInt32 spx_int32_t;
typedef UInt32 spx_uint32_t;
- typedef SInt64 spx_int64_t;
#elif defined(__MACOSX__) /* MacOS X Framework build */
@@ -69,7 +63,6 @@
typedef u_int16_t spx_uint16_t;
typedef int32_t spx_int32_t;
typedef u_int32_t spx_uint32_t;
- typedef int64_t spx_int64_t;
#elif defined(__BEOS__)
@@ -79,7 +72,6 @@
typedef u_int16_t spx_uint16_t;
typedef int32_t spx_int32_t;
typedef u_int32_t spx_uint32_t;
- typedef int64_t spx_int64_t;
#elif defined (__EMX__)
@@ -88,7 +80,6 @@
typedef unsigned short spx_uint16_t;
typedef int spx_int32_t;
typedef unsigned int spx_uint32_t;
- typedef long long spx_int64_t;
#elif defined (DJGPP)
@@ -96,12 +87,10 @@
typedef short spx_int16_t;
typedef int spx_int32_t;
typedef unsigned int spx_uint32_t;
- typedef long long spx_int64_t;
#elif defined(R5900)
/* PS2 EE */
- typedef long spx_int64_t;
typedef int spx_int32_t;
typedef unsigned spx_uint32_t;
typedef short spx_int16_t;
@@ -113,7 +102,6 @@
typedef unsigned short spx_uint16_t;
typedef signed int spx_int32_t;
typedef unsigned int spx_uint32_t;
- typedef long long int spx_int64_t;
#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
Modified: trunk/speex/libspeex/arch.h
===================================================================
--- trunk/speex/libspeex/arch.h 2006-05-20 19:29:37 UTC (rev 11413)
+++ trunk/speex/libspeex/arch.h 2006-05-20 23:03:48 UTC (rev 11414)
@@ -46,13 +46,6 @@
typedef spx_int16_t spx_word16_t;
typedef spx_int32_t spx_word32_t;
-#ifdef _MSC_VER
-typedef __int64 spx_word64_t;
-#elif defined NO_LONGLONG
-typedef double 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;
@@ -103,7 +96,6 @@
typedef float spx_sig_t;
typedef float spx_word16_t;
typedef float spx_word32_t;
-typedef float spx_word64_t;
#define Q15ONE 1.0f
#define LPC_SCALING 1.f
@@ -146,7 +138,6 @@
#define SUB16(a,b) ((a)-(b))
#define ADD32(a,b) ((a)+(b))
#define SUB32(a,b) ((a)-(b))
-#define ADD64(a,b) ((a)+(b))
#define MULT16_16_16(a,b) ((a)*(b))
#define MULT16_16(a,b) ((spx_word32_t)(a)*(spx_word32_t)(b))
#define MAC16_16(c,a,b) ((c)+(spx_word32_t)(a)*(spx_word32_t)(b))
Modified: trunk/speex/libspeex/fixed_generic.h
===================================================================
--- trunk/speex/libspeex/fixed_generic.h 2006-05-20 19:29:37 UTC (rev 11413)
+++ trunk/speex/libspeex/fixed_generic.h 2006-05-20 23:03:48 UTC (rev 11414)
@@ -61,7 +61,6 @@
#define SUB16(a,b) ((spx_word16_t)(a)-(spx_word16_t)(b))
#define ADD32(a,b) ((spx_word32_t)(a)+(spx_word32_t)(b))
#define SUB32(a,b) ((spx_word32_t)(a)-(spx_word32_t)(b))
-#define ADD64(a,b) ((spx_word64_t)(a)+(spx_word64_t)(b))
/* result fits in 16 bits */
Modified: trunk/speex/libspeex/ltp.c
===================================================================
--- trunk/speex/libspeex/ltp.c 2006-05-20 19:29:37 UTC (rev 11413)
+++ trunk/speex/libspeex/ltp.c 2006-05-20 23:03:48 UTC (rev 11414)
@@ -281,7 +281,7 @@
/** Finds the best quantized 3-tap pitch predictor by analysis by synthesis */
-static spx_word64_t pitch_gain_search_3tap(
+static spx_word32_t pitch_gain_search_3tap(
const spx_word16_t target[], /* Target vector */
const spx_coef_t ak[], /* LPCs for this subframe */
const spx_coef_t awk1[], /* Weighted LPCs #1 for this subframe */
@@ -310,7 +310,7 @@
int gain_cdbk_size;
const signed char *gain_cdbk;
spx_word16_t gain[3];
- spx_word64_t err;
+ spx_word32_t err;
const ltp_params *params;
params = (const ltp_params*) par;
@@ -518,7 +518,7 @@
VARDECL(spx_word16_t *new_target);
VARDECL(spx_word16_t *best_target);
int best_pitch=0;
- spx_word64_t err, best_err=-1;
+ spx_word32_t err, best_err=-1;
int N;
const ltp_params *params;
VARDECL(int *nbest);
More information about the commits
mailing list