mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-22 18:34:00 +00:00
0331f0c33b
Original commit message from CVS: * gst/speexresample/README: * gst/speexresample/arch.h: * gst/speexresample/fixed_arm4.h: * gst/speexresample/fixed_arm5e.h: * gst/speexresample/fixed_bfin.h: * gst/speexresample/fixed_debug.h: * gst/speexresample/fixed_generic.h: * gst/speexresample/resample.c: (compute_func), (main), (sinc), (cubic_coef), (resampler_basic_direct_single), (resampler_basic_direct_double), (resampler_basic_interpolate_single), (resampler_basic_interpolate_double), (update_filter), (speex_resampler_init_frac), (speex_resampler_process_native), (speex_resampler_magic), (speex_resampler_process_float), (speex_resampler_process_int), (speex_resampler_process_interleaved_float), (speex_resampler_process_interleaved_int), (speex_resampler_set_rate_frac), (speex_resampler_skip_zeros), (speex_resampler_reset_mem): * gst/speexresample/speex_resampler.h: Update Speex resampler with latest version from Speex GIT.
87 lines
2 KiB
Text
87 lines
2 KiB
Text
arch.h
|
|
fixed_arm4.h
|
|
fixed_arm5e.h
|
|
fixed_bfin.h
|
|
fixed_debug.h
|
|
fixed_generic.h
|
|
resample.c
|
|
speex_resampler.h
|
|
|
|
are taken from http://git.xiph.org/speex.git/ as of 2008-10-28.
|
|
|
|
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"
|
|
#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 @@
|
|
|
|
#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)
|
|
{
|
|
- return realloc (ptr, size);
|
|
+ return g_realloc (ptr, size);
|
|
}
|
|
|
|
-static void
|
|
+static inline void
|
|
speex_free (void *ptr)
|
|
{
|
|
- free (ptr);
|
|
+ g_free (ptr);
|
|
}
|
|
|
|
#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 */
|
|
|