diff options
Diffstat (limited to 'gst/speexresample/README')
| -rw-r--r-- | gst/speexresample/README | 87 |
1 files changed, 40 insertions, 47 deletions
diff --git a/gst/speexresample/README b/gst/speexresample/README index 79e11b32..68d8c290 100644 --- a/gst/speexresample/README +++ b/gst/speexresample/README @@ -1,48 +1,66 @@ - arch.h - fixed_arm4.h - fixed_arm5e.h - fixed_bfin.h - fixed_debug.h - fixed_generic.h - resample.c - speex_resampler.h +resample.c +arch.h +fixed_generic.h +speex_resampler.h -are taken from http://git.xiph.org/speex.git/ as of 2008-10-28. +are taken from http://svn.xiph.org/trunk/speex/ revision 14232. The only changes are: ---- arch.h 2008-10-28 12:21:37.000000000 +0100 -+++ arch.h 2008-10-28 12:27:56.000000000 +0100 -@@ -78,7 +78,10 @@ - #include "../include/speex/speex_types.h" +--- speex/libspeex/arch.h 2007-11-21 11:05:46.000000000 +0100 ++++ speexresample/arch.h 2007-11-20 05:41:09.000000000 +0100 +@@ -78,7 +78,9 @@ + #include "speex/speex_types.h" #endif +#ifndef ABS #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ +#endif -+ #define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ #define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ #define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */ ---- resample.c 2008-10-28 12:21:35.000000000 +0100 -+++ resample.c 2008-10-28 12:33:46.000000000 +0100 -@@ -63,22 +63,27 @@ + +--- speex/include/speex/speex_resampler.h 2007-11-21 11:05:44.000000000 +0100 ++++ speexresample/speex_resampler.h 2007-11-21 11:10:02.000000000 +0100 +@@ -41,6 +41,8 @@ + + #ifdef OUTSIDE_SPEEX + ++#include <glib.h> ++ + /********* WARNING: MENTAL SANITY ENDS HERE *************/ + + /* If the resampler is defined outside of Speex, we change the symbol names so that +@@ -75,10 +77,10 @@ + #define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem) + #define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror) + +-#define spx_int16_t short +-#define spx_int32_t int +-#define spx_uint16_t unsigned short +-#define spx_uint32_t unsigned int ++#define spx_int16_t gint16 ++#define spx_int32_t gint32 ++#define spx_uint16_t guint16 ++#define spx_uint32_t guint32 + + #else /* OUTSIDE_SPEEX */ + +--- speex/libspeex/resample.c 2007-11-25 14:15:38.000000000 +0100 ++++ speexresample/resample.c 2007-11-25 14:15:31.000000000 +0100 +@@ -62,20 +62,23 @@ #ifdef OUTSIDE_SPEEX #include <stdlib.h> -static void * -+ +#include <glib.h> + -+#define EXPORT -+ +static inline void * speex_alloc (int size) { - return calloc (size, 1); + return g_malloc0 (size); } - -static void * +static inline void * speex_realloc (void *ptr, int size) @@ -50,8 +68,8 @@ The only changes are: - return realloc (ptr, size); + return g_realloc (ptr, size); } - -static void ++ +static inline void speex_free (void *ptr) { @@ -60,28 +78,3 @@ The only changes are: } #include "speex_resampler.h" -@@ -90,7 +95,6 @@ - #include "os_support.h" - #endif /* OUTSIDE_SPEEX */ - --#include "stack_alloc.h" - #include <math.h> - - #ifndef M_PI ---- speex_resampler.h 2008-10-28 12:21:37.000000000 +0100 -+++ speex_resampler.h 2008-10-28 12:30:48.000000000 +0100 -@@ -77,10 +77,10 @@ - #define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem) - #define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror) - --#define spx_int16_t short --#define spx_int32_t int --#define spx_uint16_t unsigned short --#define spx_uint32_t unsigned int -+#define spx_int16_t gint16 -+#define spx_int32_t gint32 -+#define spx_uint16_t guint16 -+#define spx_uint32_t guint32 - - #else /* OUTSIDE_SPEEX */ - |