[xiph-commits] r7113 - in trunk/speex: . include include/speex

jm at dactyl.lonelymoon.com jm
Tue Jul 13 20:51:00 PDT 2004


libspeex src
Message-ID: <20040714035100.207879AAAB at dactyl.lonelymoon.com>

Author: jm
Date: Tue Jul 13 20:51:00 2004
New Revision: 7113

Added:
trunk/speex/include/
trunk/speex/include/Makefile.am
trunk/speex/include/speex/
trunk/speex/include/speex/Makefile.am
trunk/speex/include/speex/speex.h
trunk/speex/include/speex/speex_bits.h
trunk/speex/include/speex/speex_callbacks.h
trunk/speex/include/speex/speex_echo.h
trunk/speex/include/speex/speex_header.h
trunk/speex/include/speex/speex_jitter.h
trunk/speex/include/speex/speex_noglobals.h
trunk/speex/include/speex/speex_preprocess.h
trunk/speex/include/speex/speex_stereo.h
trunk/speex/speex.m4
trunk/speex/speex.pc.in
Removed:
trunk/speex/libspeex/speex.h
trunk/speex/libspeex/speex_bits.h
trunk/speex/libspeex/speex_callbacks.h
trunk/speex/libspeex/speex_echo.h
trunk/speex/libspeex/speex_header.h
trunk/speex/libspeex/speex_jitter.h
trunk/speex/libspeex/speex_noglobals.h
trunk/speex/libspeex/speex_preprocess.h
trunk/speex/libspeex/speex_stereo.h
Modified:
trunk/speex/Makefile.am
trunk/speex/configure.in
trunk/speex/libspeex/Makefile.am
trunk/speex/libspeex/bits.c
trunk/speex/libspeex/cb_search.h
trunk/speex/libspeex/jitter.c
trunk/speex/libspeex/ltp.c
trunk/speex/libspeex/ltp.h
trunk/speex/libspeex/mdf.c
trunk/speex/libspeex/misc.h
trunk/speex/libspeex/modes.h
trunk/speex/libspeex/nb_celp.c
trunk/speex/libspeex/nb_celp.h
trunk/speex/libspeex/preprocess.c
trunk/speex/libspeex/quant_lsp.h
trunk/speex/libspeex/sb_celp.h
trunk/speex/libspeex/speex_callbacks.c
trunk/speex/libspeex/speex_header.c
trunk/speex/libspeex/stereo.c
trunk/speex/libspeex/testdenoise.c
trunk/speex/libspeex/testecho.c
trunk/speex/libspeex/testenc.c
trunk/speex/libspeex/testenc_uwb.c
trunk/speex/libspeex/testenc_wb.c
trunk/speex/src/Makefile.am
trunk/speex/src/speexdec.c
trunk/speex/src/speexenc.c
Log:
Moved all the includes from /usr/include to /usr/include/speex


Modified: trunk/speex/Makefile.am
===================================================================
--- trunk/speex/Makefile.am	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/Makefile.am	2004-07-14 03:50:57 UTC (rev 7113)
@@ -3,12 +3,18 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies

+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = speex.pc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = speex.pc
+
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop

#Fools KDevelop into including all files
-SUBDIRS = libspeex @src@ doc win32
+SUBDIRS = libspeex include @src@ doc win32

-DIST_SUBDIRS = libspeex src doc win32
+DIST_SUBDIRS = libspeex include src doc win32

rpm: dist
rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz

Modified: trunk/speex/configure.in
===================================================================
--- trunk/speex/configure.in	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/configure.in	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. -*-m4-*-

-AC_INIT(libspeex/speex.h)
+AC_INIT(libspeex/speex.c)

SPEEX_MAJOR_VERSION=1
SPEEX_MINOR_VERSION=1
@@ -21,6 +21,8 @@
VERSION=$SPEEX_VERSION
PACKAGE=speex

+AC_SUBST(SPEEX_VERSION)
+
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
AM_MAINTAINER_MODE

@@ -95,6 +97,7 @@
dnl Output the makefiles and version.h.

AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
+           include/Makefile include/speex/Makefile speex.pc
win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
win32/speexdec/Makefile ])


Added: trunk/speex/include/Makefile.am
===================================================================
--- trunk/speex/include/Makefile.am	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/include/Makefile.am	2004-07-14 03:50:57 UTC (rev 7113)
@@ -0,0 +1,2 @@
+
+SUBDIRS = speex

Added: trunk/speex/include/speex/Makefile.am
===================================================================
--- trunk/speex/include/speex/Makefile.am	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/include/speex/Makefile.am	2004-07-14 03:50:57 UTC (rev 7113)
@@ -0,0 +1,13 @@
+# Disable automatic dependency tracking if using other tools than gcc and gmake
+#AUTOMAKE_OPTIONS = no-dependencies
+
+pkginclude_HEADERS =  speex.h \
+	speex_bits.h \
+	speex_header.h \
+	speex_callbacks.h \
+	speex_stereo.h \
+	speex_preprocess.h \
+	speex_jitter.h \
+	speex_echo.h \
+	speex_noglobals.h
+

Copied: trunk/speex/include/speex/speex.h (from rev 7058, trunk/speex/libspeex/speex.h)

Copied: trunk/speex/include/speex/speex_bits.h (from rev 6595, trunk/speex/libspeex/speex_bits.h)

Copied: trunk/speex/include/speex/speex_callbacks.h (from rev 6595, trunk/speex/libspeex/speex_callbacks.h)

Copied: trunk/speex/include/speex/speex_echo.h (from rev 6595, trunk/speex/libspeex/speex_echo.h)

Copied: trunk/speex/include/speex/speex_header.h (from rev 6595, trunk/speex/libspeex/speex_header.h)

Copied: trunk/speex/include/speex/speex_jitter.h (from rev 7077, trunk/speex/libspeex/speex_jitter.h)

Copied: trunk/speex/include/speex/speex_noglobals.h (from rev 7063, trunk/speex/libspeex/speex_noglobals.h)

Copied: trunk/speex/include/speex/speex_preprocess.h (from rev 6595, trunk/speex/libspeex/speex_preprocess.h)

Copied: trunk/speex/include/speex/speex_stereo.h (from rev 6595, trunk/speex/libspeex/speex_stereo.h)

Modified: trunk/speex/libspeex/Makefile.am
===================================================================
--- trunk/speex/libspeex/Makefile.am	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/Makefile.am	2004-07-14 03:50:57 UTC (rev 7113)
@@ -4,6 +4,8 @@

EXTRA_DIST=testenc.c testenc_wb.c testenc_uwb.c testdenoise.c testecho.c

+INCLUDES = -I$(top_srcdir)/include
+
lib_LTLIBRARIES = libspeex.la

if DISABLE_GLOBAL_POINTERS
@@ -49,17 +51,6 @@
jitter.c \
mdf.c

-
-include_HEADERS =  speex.h \
-	speex_bits.h \
-	speex_header.h \
-	speex_callbacks.h \
-	speex_stereo.h \
-	speex_preprocess.h \
-	speex_jitter.h \
-	speex_echo.h \
-	speex_noglobals.h
-
noinst_HEADERS = lsp.h \
nb_celp.h \
lpc.h \

Modified: trunk/speex/libspeex/bits.c
===================================================================
--- trunk/speex/libspeex/bits.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/bits.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -32,7 +32,7 @@

*/

-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "misc.h"

/** Maximum size of the bit-stream (for fixed-size allocation) */

Modified: trunk/speex/libspeex/cb_search.h
===================================================================
--- trunk/speex/libspeex/cb_search.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/cb_search.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,5 +1,5 @@
/* Copyright (C) 2002 Jean-Marc Valin & David Rowe
-   File: cb_search.c
+   File: cb_search.h
Overlapped codebook search

Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
#ifndef CB_SEARCH_H
#define CB_SEARCH_H

-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "misc.h"

typedef struct split_cb_params {

Modified: trunk/speex/libspeex/jitter.c
===================================================================
--- trunk/speex/libspeex/jitter.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/jitter.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -36,9 +36,9 @@
#define NULL 0
#endif

-#include "speex.h"
-#include "speex_bits.h"
-#include "speex_jitter.h"
+#include <speex/speex.h>
+#include <speex/speex_bits.h>
+#include <speex/speex_jitter.h>
#include <stdio.h>

#define LATE_BINS 4

Modified: trunk/speex/libspeex/ltp.c
===================================================================
--- trunk/speex/libspeex/ltp.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/ltp.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -34,7 +34,7 @@
#include "ltp.h"
#include "stack_alloc.h"
#include "filters.h"
-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "math_approx.h"

#include <stdio.h>

Modified: trunk/speex/libspeex/ltp.h
===================================================================
--- trunk/speex/libspeex/ltp.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/ltp.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -30,7 +30,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "misc.h"

typedef struct ltp_params {

Modified: trunk/speex/libspeex/mdf.c
===================================================================
--- trunk/speex/libspeex/mdf.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/mdf.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -35,7 +35,7 @@
*/

#include "misc.h"
-#include "speex_echo.h"
+#include <speex/speex_echo.h>
#include "smallft.h"
#include <math.h>
/*#include <stdio.h>*/

Modified: trunk/speex/libspeex/misc.h
===================================================================
--- trunk/speex/libspeex/misc.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/misc.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -37,8 +37,8 @@

#ifndef SPEEX_VERSION
#define SPEEX_MAJOR_VERSION 1
-#define SPEEX_MAJOR_VERSION 1
-#define SPEEX_MAJOR_VERSION 6
+#define SPEEX_MINOR_VERSION 1
+#define SPEEX_MICRO_VERSION 6
#define SPEEX_EXTRA_VERSION ""
#define SPEEX_VERSION "speex-1.1.6"
#endif

Modified: trunk/speex/libspeex/modes.h
===================================================================
--- trunk/speex/libspeex/modes.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/modes.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -36,8 +36,8 @@
#ifndef MODES_H
#define MODES_H

-#include "speex.h"
-#include "speex_bits.h"
+#include <speex/speex.h>
+#include <speex/speex_bits.h>
#include "misc.h"

#define NB_SUBMODES 16

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/nb_celp.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -39,10 +39,10 @@
#include "filters.h"
#include "stack_alloc.h"
#include "vq.h"
-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "vbr.h"
#include "misc.h"
-#include "speex_callbacks.h"
+#include <speex/speex_callbacks.h>

#include <stdio.h>


Modified: trunk/speex/libspeex/nb_celp.h
===================================================================
--- trunk/speex/libspeex/nb_celp.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/nb_celp.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -37,8 +37,8 @@
#define NB_CELP_H

#include "modes.h"
-#include "speex_bits.h"
-#include "speex_callbacks.h"
+#include <speex/speex_bits.h>
+#include <speex/speex_callbacks.h>
#include "vbr.h"
#include "filters.h"


Modified: trunk/speex/libspeex/preprocess.c
===================================================================
--- trunk/speex/libspeex/preprocess.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/preprocess.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -32,7 +32,7 @@
*/

#include <math.h>
-#include "speex_preprocess.h"
+#include <speex/speex_preprocess.h>
#include "misc.h"
#include "smallft.h"


Modified: trunk/speex/libspeex/quant_lsp.h
===================================================================
--- trunk/speex/libspeex/quant_lsp.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/quant_lsp.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -33,7 +33,7 @@
#ifndef QUANT_LSP_H
#define QUANT_LSP_H

-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "misc.h"

#define MAX_LSP_SIZE 20

Modified: trunk/speex/libspeex/sb_celp.h
===================================================================
--- trunk/speex/libspeex/sb_celp.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/sb_celp.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -37,7 +37,7 @@
#define SB_CELP_H

#include "modes.h"
-#include "speex_bits.h"
+#include <speex/speex_bits.h>
#include "nb_celp.h"

/**Structure representing the full state of the sub-band encoder*/

Deleted: trunk/speex/libspeex/speex.h
===================================================================
--- trunk/speex/libspeex/speex.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,388 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin*/
-/**
-  @file speex.h
-  @brief Describes the different modes of the codec
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef SPEEX_H
-#define SPEEX_H
-
-#include "speex_bits.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Values allowed for *ctl() requests */
-
-/** Set enhancement on/off (decoder only) */
-#define SPEEX_SET_ENH 0
-/** Get enhancement state (decoder only) */
-#define SPEEX_GET_ENH 1
-
-/*Would be SPEEX_SET_FRAME_SIZE, but it's (currently) invalid*/
-/** Obtain frame size used by encoder/decoder */
-#define SPEEX_GET_FRAME_SIZE 3
-
-/** Set quality value */
-#define SPEEX_SET_QUALITY 4
-/** Get current quality setting */
-#define SPEEX_GET_QUALITY 5
-
-/** Set sub-mode to use */
-#define SPEEX_SET_MODE 6
-/** Get current sub-mode in use */
-#define SPEEX_GET_MODE 7
-
-/** Set low-band sub-mode to use (wideband only)*/
-#define SPEEX_SET_LOW_MODE 8
-/** Get current low-band mode in use (wideband only)*/
-#define SPEEX_GET_LOW_MODE 9
-
-/** Set high-band sub-mode to use (wideband only)*/
-#define SPEEX_SET_HIGH_MODE 10
-/** Get current high-band mode in use (wideband only)*/
-#define SPEEX_GET_HIGH_MODE 11
-
-/** Set VBR on (1) or off (0) */
-#define SPEEX_SET_VBR 12
-/** Get VBR status (1 for on, 0 for off) */
-#define SPEEX_GET_VBR 13
-
-/** Set quality value for VBR encoding (0-10) */
-#define SPEEX_SET_VBR_QUALITY 14
-/** Get current quality value for VBR encoding (0-10) */
-#define SPEEX_GET_VBR_QUALITY 15
-
-/** Set complexity of the encoder (0-10) */
-#define SPEEX_SET_COMPLEXITY 16
-/** Get current complexity of the encoder (0-10) */
-#define SPEEX_GET_COMPLEXITY 17
-
-/** Set bit-rate used by the encoder (or lower) */
-#define SPEEX_SET_BITRATE 18
-/** Get current bit-rate used by the encoder or decoder */
-#define SPEEX_GET_BITRATE 19
-
-/**Define a handler function for in-band Speex request*/
-#define SPEEX_SET_HANDLER 20
-
-/**Define a handler function for in-band user-defined request*/
-#define SPEEX_SET_USER_HANDLER 22
-
-/** Set sampling rate used in bit-rate computation */
-#define SPEEX_SET_SAMPLING_RATE 24
-/** Get sampling rate used in bit-rate computation */
-#define SPEEX_GET_SAMPLING_RATE 25
-
-/** Reset the encoder/decoder memories to zero*/
-#define SPEEX_RESET_STATE 26
-
-/** Get VBR info (mostly used internally) */
-#define SPEEX_GET_RELATIVE_QUALITY 29
-
-/** Set VAD status (1 for on, 0 for off) */
-#define SPEEX_SET_VAD 30
-
-/** Get VAD status (1 for on, 0 for off) */
-#define SPEEX_GET_VAD 31
-
-/** Set Average Bit-Rate (ABR) to n bits per seconds */
-#define SPEEX_SET_ABR 32
-/** Get Average Bit-Rate (ABR) setting (in bps) */
-#define SPEEX_GET_ABR 33
-
-/** Set DTX status (1 for on, 0 for off) */
-#define SPEEX_SET_DTX 34
-/** Get DTX status (1 for on, 0 for off) */
-#define SPEEX_GET_DTX 35
-
-/** Set submode encoding in each frame (1 for yes, 0 for no, setting to no breaks the standard) */
-#define SPEEX_SET_SUBMODE_ENCODING 36
-/** */
-#define SPEEX_GET_SUBMODE_ENCODING 37
-
-/*#define SPEEX_SET_SUBMODE_ENCODING 38*/
-/** */
-#define SPEEX_GET_LOOKAHEAD 39
-
-
-/* Used internally, not to be used in applications */
-/** Used internally*/
-#define SPEEX_GET_PI_GAIN 100
-/** Used internally*/
-#define SPEEX_GET_EXC     101
-/** Used internally*/
-#define SPEEX_GET_INNOV   102
-/** Used internally*/
-#define SPEEX_GET_DTX_STATUS   103
-
-
-/* Preserving compatibility:*/
-/** Equivalent to SPEEX_SET_ENH */
-#define SPEEX_SET_PF 0
-/** Equivalent to SPEEX_GET_ENH */
-#define SPEEX_GET_PF 1
-
-
-
-
-/* Values allowed for mode queries */
-/** Query the frame size of a mode */
-#define SPEEX_MODE_FRAME_SIZE 0
-
-/** Query the size of an encoded frame for a particular sub-mode */
-#define SPEEX_SUBMODE_BITS_PER_FRAME 1
-
-
-
-#define SPEEX_LIB_GET_MAJOR_VERSION 1
-#define SPEEX_LIB_GET_MINOR_VERSION 3
-#define SPEEX_LIB_GET_MICRO_VERSION 5
-#define SPEEX_LIB_GET_EXTRA_VERSION 7
-#define SPEEX_LIB_GET_VERSION_STRING 9
-
-/*#define SPEEX_LIB_SET_ALLOC_FUNC 10
-#define SPEEX_LIB_GET_ALLOC_FUNC 11
-#define SPEEX_LIB_SET_FREE_FUNC 12
-#define SPEEX_LIB_GET_FREE_FUNC 13
-
-#define SPEEX_LIB_SET_WARNING_FUNC 14
-#define SPEEX_LIB_GET_WARNING_FUNC 15
-#define SPEEX_LIB_SET_ERROR_FUNC 16
-#define SPEEX_LIB_GET_ERROR_FUNC 17
-*/
-
-/** Number of defined modes in Speex */
-#define SPEEX_NB_MODES 3
-
-struct SpeexMode;
-
-
-/* Prototypes for mode function pointers */
-
-/** Encoder state initialization function */
-typedef void *(*encoder_init_func)(const struct SpeexMode *mode);
-
-/** Encoder state destruction function */
-typedef void (*encoder_destroy_func)(void *st);
-
-/** Main encoding function */
-typedef int (*encode_func)(void *state, void *in, SpeexBits *bits);
-
-/** Function for controlling the encoder options */
-typedef int (*encoder_ctl_func)(void *state, int request, void *ptr);
-
-/** Decoder state initialization function */
-typedef void *(*decoder_init_func)(const struct SpeexMode *mode);
-
-/** Decoder state destruction function */
-typedef void (*decoder_destroy_func)(void *st);
-
-/** Main decoding function */
-typedef int  (*decode_func)(void *state, SpeexBits *bits, void *out);
-
-/** Function for controlling the decoder options */
-typedef int (*decoder_ctl_func)(void *state, int request, void *ptr);
-
-
-/** Query function for a mode */
-typedef int (*mode_query_func)(const void *mode, int request, void *ptr);
-
-/** Struct defining a Speex mode */
-typedef struct SpeexMode {
-   /** Pointer to the low-level mode data */
-   const void *mode;
-
-   /** Pointer to the mode query function */
-   mode_query_func query;
-
-   /** The name of the mode (you should not rely on this to identify the mode)*/
-   char *modeName;
-
-   /**ID of the mode*/
-   int modeID;
-
-   /**Version number of the bitstream (incremented every time we break
-    bitstream compatibility*/
-   int bitstream_version;
-
-   /** Pointer to encoder initialization function */
-   encoder_init_func enc_init;
-
-   /** Pointer to encoder destruction function */
-   encoder_destroy_func enc_destroy;
-
-   /** Pointer to frame encoding function */
-   encode_func enc;
-
-   /** Pointer to decoder initialization function */
-   decoder_init_func dec_init;
-
-   /** Pointer to decoder destruction function */
-   decoder_destroy_func dec_destroy;
-
-   /** Pointer to frame decoding function */
-   decode_func dec;
-
-   /** ioctl-like requests for encoder */
-   encoder_ctl_func enc_ctl;
-
-   /** ioctl-like requests for decoder */
-   decoder_ctl_func dec_ctl;
-
-} SpeexMode;
-
-/**
- * Returns a handle to a newly created Speex encoder state structure. For now,
- * the "mode" argument can be &nb_mode or &wb_mode . In the future, more modes
- * may be added. Note that for now if you have more than one channels to
- * encode, you need one state per channel.
- *
- * @param mode The mode to use (either speex_nb_mode or speex_wb.mode)
- * @return A newly created encoder
- */
-void *speex_encoder_init(const SpeexMode *mode);
-
-/** Frees all resources associated to an existing Speex encoder state.
- * @param state Encoder state to be destroyed */
-void speex_encoder_destroy(void *state);
-
-/** Uses an existing encoder state to encode one frame of speech pointed to by
-    "in". The encoded bit-stream is saved in "bits".
- @param state Encoder state
- @param in Frame that will be encoded with a +-2^16 range
- @param bits Bit-stream where the data will be written
- */
-int speex_encode(void *state, float *in, SpeexBits *bits);
-
-/** Uses an existing encoder state to encode one frame of speech pointed to by
-    "in". The encoded bit-stream is saved in "bits".
- @param state Encoder state
- @param in Frame that will be encoded with a +-2^16 range
- @param bits Bit-stream where the data will be written
- */
-int speex_encode_int(void *state, short *in, SpeexBits *bits);
-
-/** Used like the ioctl function to control the encoder parameters
- *
- * @param state Encoder state
- * @param request ioctl-type request (one of the SPEEX_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if frame needs not be transmitted (DTX only), 1 otherwise
- */
-int speex_encoder_ctl(void *state, int request, void *ptr);
-
-
-/** Returns a handle to a newly created decoder state structure. For now,
- * the mode argument can be &nb_mode or &wb_mode . In the future, more modes
- * may be added.  Note that for now if you have more than one channels to
- * decode, you need one state per channel.
- *
- * @param mode Speex mode (one of speex_nb_mode or speex_wb_mode)
- * @return A newly created decoder state
- */
-void *speex_decoder_init(const SpeexMode *mode);
-
-/** Frees all resources associated to an existing decoder state.
- *
- * @param state State to be destroyed
- */
-void speex_decoder_destroy(void *state);
-
-/** Uses an existing decoder state to decode one frame of speech from
- * bit-stream bits. The output speech is saved written to out.
- *
- * @param state Decoder state
- * @param bits Bit-stream from which to decode the frame (NULL if the packet was lost)
- * @param out Where to write the decoded frame
- * @return return status (0 for no error, -1 for end of stream, -2 other)
- */
-int speex_decode(void *state, SpeexBits *bits, float *out);
-
-/** Uses an existing decoder state to decode one frame of speech from
- * bit-stream bits. The output speech is saved written to out.
- *
- * @param state Decoder state
- * @param bits Bit-stream from which to decode the frame (NULL if the packet was lost)
- * @param out Where to write the decoded frame
- * @return return status (0 for no error, -1 for end of stream, -2 other)
- */
-int speex_decode_int(void *state, SpeexBits *bits, short *out);
-
-/** Used like the ioctl function to control the encoder parameters
- *
- * @param state Decoder state
- * @param request ioctl-type request (one of the SPEEX_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 for no error, 1 if a terminator is reached, 2 for another error
- */
-int speex_decoder_ctl(void *state, int request, void *ptr);
-
-
-/** Query function for mode information
- *
- * @param mode Speex mode
- * @param request ioctl-type request (one of the SPEEX_* macros)
- * @param ptr Data exchanged to-from function
- */
-int speex_mode_query(const SpeexMode *mode, int request, void *ptr);
-
-/** Functions for controlling the behavior of libspeex
- * @param request ioctl-type request (one of the SPEEX_LIB_* macros)
- * @param ptr Data exchanged to-from function
- */
-int speex_lib_ctl(int request, void *ptr);
-
-/** Default narrowband mode */
-extern const SpeexMode speex_nb_mode;
-
-/** Default wideband mode */
-extern const SpeexMode speex_wb_mode;
-
-/** Default "ultra-wideband" mode */
-extern const SpeexMode speex_uwb_mode;
-
-#ifdef EPIC_48K
-/** 4.8 kbps narrowband mode */
-extern const SpeexMode speex_nb_48k_mode;
-#endif
-
-/** List of all modes available */
-extern const SpeexMode *speex_mode_list[SPEEX_NB_MODES];
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Deleted: trunk/speex/libspeex/speex_bits.h
===================================================================
--- trunk/speex/libspeex/speex_bits.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_bits.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,151 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
-/**
-   @file speex_bits.h
-   @brief Handles bit packing/unpacking
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef BITS_H
-#define BITS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Bit-packing data structure representing (part of) a bit-stream. */
-typedef struct SpeexBits {
-   char *bytes;   /**< "raw" data */
-   int   nbBits;  /**< Total number of bits stored in the stream*/
-   int   bytePtr; /**< Position of the byte "cursor" */
-   int   bitPtr;  /**< Position of the bit "cursor" within the current byte */
-   int   owner;   /**< Does the struct "own" the "raw" buffer (member "bytes") */
-   int   overflow;/**< Set to one if we try to read past the valid data */
-   int   buf_size;/**< Allocated size for buffer */
-   int   reserved1; /**< Reserved for future use */
-   void *reserved2; /**< Reserved for future use */
-} SpeexBits;
-
-/** Initializes and allocates resources for a SpeexBits struct */
-void speex_bits_init(SpeexBits *bits);
-
-/** Initializes SpeexBits struct using a pre-allocated buffer*/
-void speex_bits_init_buffer(SpeexBits *bits, void *buff, int buf_size);
-
-/** Frees all resources associated to a SpeexBits struct. Right now this does nothing since no resources are allocated, but this could change in the future.*/
-void speex_bits_destroy(SpeexBits *bits);
-
-/** Resets bits to initial value (just after initialization, erasing content)*/
-void speex_bits_reset(SpeexBits *bits);
-
-/** Rewind the bit-stream to the beginning (ready for read) without erasing the content */
-void speex_bits_rewind(SpeexBits *bits);
-
-/** Initializes the bit-stream from the data in an area of memory */
-void speex_bits_read_from(SpeexBits *bits, char *bytes, int len);
-
-/** Append bytes to the bit-stream
- * @param bits Bit-stream to operate on
- * @param bytes pointer to the bytes what will be appended
- * @param len Number of bytes of append
- */
-void speex_bits_read_whole_bytes(SpeexBits *bits, char *bytes, int len);
-
-/** Write the content of a bit-stream to an area of memory */
-int speex_bits_write(SpeexBits *bits, char *bytes, int max_len);
-
-/** Like speex_bits_write, but writes only the complete bytes in the stream. Also removes the written bytes from the stream */
-int speex_bits_write_whole_bytes(SpeexBits *bits, char *bytes, int max_len);
-
-/** Append bits to the bit-stream
- * @param bits Bit-stream to operate on
- * @param data Value to append as integer
- * @param nbBits number of bits to consider in "data"
- */
-void speex_bits_pack(SpeexBits *bits, int data, int nbBits);
-
-/** Interpret the next bits in the bit-stream as a signed integer
- *
- * @param bits Bit-stream to operate on
- * @param nbBits Number of bits to interpret
- * @return A signed integer represented by the bits read
- */
-int speex_bits_unpack_signed(SpeexBits *bits, int nbBits);
-
-/** Interpret the next bits in the bit-stream as an unsigned integer
- *
- * @param bits Bit-stream to operate on
- * @param nbBits Number of bits to interpret
- * @return An unsigned integer represented by the bits read
- */
-unsigned int speex_bits_unpack_unsigned(SpeexBits *bits, int nbBits);
-
-/** Returns the number of bytes in the bit-stream, including the last one even if it is not "full"
- *
- * @param bits Bit-stream to operate on
- * @return Number of bytes in the stream
- */
-int speex_bits_nbytes(SpeexBits *bits);
-
-/** Same as speex_bits_unpack_unsigned, but without modifying the cursor position */
-unsigned int speex_bits_peek_unsigned(SpeexBits *bits, int nbBits);
-
-/** Get the value of the next bit in the stream, without modifying the
- * "cursor" position
- *
- * @param bits Bit-stream to operate on
- */
-int speex_bits_peek(SpeexBits *bits);
-
-/** Advances the position of the "bit cursor" in the stream
- *
- * @param bits Bit-stream to operate on
- * @param n Number of bits to advance
- */
-void speex_bits_advance(SpeexBits *bits, int n);
-
-/** Returns the number of bits remaining to be read in a stream
- *
- * @param bits Bit-stream to operate on
- */
-int speex_bits_remaining(SpeexBits *bits);
-
-/** Insert a terminator so that the data can be sent as a packet while auto-detecting
- * the number of frames in each packet
- *
- * @param bits Bit-stream to operate on
- */
-void speex_bits_insert_terminator(SpeexBits *bits);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

Modified: trunk/speex/libspeex/speex_callbacks.c
===================================================================
--- trunk/speex/libspeex/speex_callbacks.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_callbacks.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -32,7 +32,7 @@

*/

-#include "speex_callbacks.h"
+#include <speex/speex_callbacks.h>
#include "misc.h"

int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *state)

Deleted: trunk/speex/libspeex/speex_callbacks.h
===================================================================
--- trunk/speex/libspeex/speex_callbacks.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_callbacks.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,128 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin*/
-/**
-  @file speex_callbacks.h
-  @brief Describes callback handling and in-band signalling
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef SPEEX_CALLBACKS_H
-#define SPEEX_CALLBACKS_H
-
-#include "speex.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Total number of callbacks */
-#define SPEEX_MAX_CALLBACKS 16
-
-/* Describes all the in-band requests */
-
-/*These are 1-bit requests*/
-/** Request for perceptual enhancement (1 for on, 0 for off) */
-#define SPEEX_INBAND_ENH_REQUEST         0
-/** Reserved */
-#define SPEEX_INBAND_RESERVED1           1
-
-/*These are 4-bit requests*/
-/** Request for a mode change */
-#define SPEEX_INBAND_MODE_REQUEST        2
-/** Request for a low mode change */
-#define SPEEX_INBAND_LOW_MODE_REQUEST    3
-/** Request for a high mode change */
-#define SPEEX_INBAND_HIGH_MODE_REQUEST   4
-/** Request for VBR (1 on, 0 off) */
-#define SPEEX_INBAND_VBR_QUALITY_REQUEST 5
-/** Request to be sent acknowledge */
-#define SPEEX_INBAND_ACKNOWLEDGE_REQUEST 6
-/** Request for VBR (1 for on, 0 for off) */
-#define SPEEX_INBAND_VBR_REQUEST         7
-
-/*These are 8-bit requests*/
-/** Send a character in-band */
-#define SPEEX_INBAND_CHAR                8
-/** Intensity stereo information */
-#define SPEEX_INBAND_STEREO              9
-
-/*These are 16-bit requests*/
-/** Transmit max bit-rate allowed */
-#define SPEEX_INBAND_MAX_BITRATE         10
-
-/*These are 32-bit requests*/
-/** Acknowledge packet reception */
-#define SPEEX_INBAND_ACKNOWLEDGE         12
-
-/** Callback function type */
-typedef int (*speex_callback_func)(SpeexBits *bits, void *state, void *data);
-
-/** Callback information */
-typedef struct SpeexCallback {
-   int callback_id;             /**< ID associated to the callback */
-   speex_callback_func func;    /**< Callback handler function */
-   void *data;                  /**< Data that will be sent to the handler */
-   void *reserved1;             /**< Reserved for future use */
-   int   reserved2;             /**< Reserved for future use */
-} SpeexCallback;
-
-/** Handle in-band request */
-int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *state);
-
-/** Standard handler for mode request (change mode, no questions asked) */
-int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for high mode request (change high mode, no questions asked) */
-int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for in-band characters (write to stderr) */
-int speex_std_char_handler(SpeexBits *bits, void *state, void *data);
-
-/** Default handler for user-defined requests: in this case, just ignore */
-int speex_default_user_handler(SpeexBits *bits, void *state, void *data);
-
-
-
-
-int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data);
-
-int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data);
-
-int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data);
-
-int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *data);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Deleted: trunk/speex/libspeex/speex_echo.h
===================================================================
--- trunk/speex/libspeex/speex_echo.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_echo.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,82 +0,0 @@
-/* Copyright (C) Jean-Marc Valin
-
-   File: speex_echo.h
-
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef SPEEX_ECHO_H
-#define SPEEX_ECHO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct drft_lookup;
-
-typedef struct SpeexEchoState {
-   int frame_size;           /**< Number of samples processed each time */
-   int window_size;
-   int M;
-   int cancel_count;
-   float adapt_rate;
-
-   float *x;
-   float *X;
-   float *d;
-   float *D;
-   float *y;
-   float *Y;
-   float *E;
-   float *PHI;
-   float *W;
-   float *power;
-   float *power_1;
-   float *grad;
-   float *old_grad;
-
-   struct drft_lookup *fft_lookup;
-
-
-} SpeexEchoState;
-
-
-/** Creates a new echo canceller state */
-SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length);
-
-/** Destroys an echo canceller state */
-void speex_echo_state_destroy(SpeexEchoState *st);
-
-/** Performs echo cancellation a frame */
-void speex_echo_cancel(SpeexEchoState *st, short *ref, short *echo, short *out, int *Y);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

Modified: trunk/speex/libspeex/speex_header.c
===================================================================
--- trunk/speex/libspeex/speex_header.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_header.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -31,9 +31,9 @@

*/

-#include "speex_header.h"
+#include <speex/speex_header.h>
#include "misc.h"
-#include "speex.h"
+#include <speex/speex.h>

#ifndef NULL
#define NULL 0

Deleted: trunk/speex/libspeex/speex_header.h
===================================================================
--- trunk/speex/libspeex/speex_header.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_header.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,82 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
-/**
-   @file speex_header.h
-   @brief Describes the Speex header
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-
-#ifndef SPEEX_HEADER_H
-#define SPEEX_HEADER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct SpeexMode;
-
-/** Maximum number of characters for encoding the Speex version number in the header */
-#define SPEEX_HEADER_VERSION_LENGTH 20
-
-/** Speex header info for file-based formats */
-typedef struct SpeexHeader {
-   char speex_string[8];       /**< Identifies a Speex bit-stream, always set to "Speex   " */
-   char speex_version[SPEEX_HEADER_VERSION_LENGTH]; /**< Speex version */
-   int speex_version_id;       /**< Version for Speex (for checking compatibility) */
-   int header_size;            /**< Total size of the header ( sizeof(SpeexHeader) ) */
-   int rate;                   /**< Sampling rate used */
-   int mode;                   /**< Mode used (0 for narrowband, 1 for wideband) */
-   int mode_bitstream_version; /**< Version ID of the bit-stream */
-   int nb_channels;            /**< Number of channels encoded */
-   int bitrate;                /**< Bit-rate used */
-   int frame_size;             /**< Size of frames */
-   int vbr;                    /**< 1 for a VBR encoding, 0 otherwise */
-   int frames_per_packet;      /**< Number of frames stored per Ogg packet */
-   int extra_headers;          /**< Number of additional headers after the comments */
-   int reserved1;              /**< Reserved for future use, must be zero */
-   int reserved2;              /**< Reserved for future use, must be zero */
-} SpeexHeader;
-
-/** Initializes a SpeexHeader using basic information */
-void speex_init_header(SpeexHeader *header, int rate, int nb_channels, const struct SpeexMode *m);
-
-/** Creates the header packet from the header itself (mostly involves endianness conversion) */
-char *speex_header_to_packet(SpeexHeader *header, int *size);
-
-/** Creates a SpeexHeader from a packet */
-SpeexHeader *speex_packet_to_header(char *packet, int size);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Deleted: trunk/speex/libspeex/speex_jitter.h
===================================================================
--- trunk/speex/libspeex/speex_jitter.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_jitter.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,91 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin
-   File: speex_jitter.h
-
-   Adaptive jitter buffer for Speex
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef SPEEX_JITTER_H
-#define SPEEX_JITTER_H
-
-#include "speex.h"
-#include "speex_bits.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SPEEX_JITTER_MAX_PACKET_SIZE 1500
-#define SPEEX_JITTER_MAX_BUFFER_SIZE 20
-
-#define MAX_MARGIN 12
-
-typedef struct SpeexJitter {
-   int buffer_size;
-   int pointer_timestamp;
-
-   SpeexBits current_packet;
-   int valid_bits;
-
-   char buf[SPEEX_JITTER_MAX_BUFFER_SIZE][SPEEX_JITTER_MAX_PACKET_SIZE];
-   int timestamp[SPEEX_JITTER_MAX_BUFFER_SIZE];
-   int len[SPEEX_JITTER_MAX_BUFFER_SIZE];
-
-   void *dec;
-   int frame_size;
-   int frame_time;
-   int reset_state;
-
-   int lost_count;
-   float drift_average;
-   float shortterm_margin[MAX_MARGIN];
-   float longterm_margin[MAX_MARGIN];
-   float late_ratio;
-   float ontime_ratio;
-   float early_ratio;
-   float loss_rate;
-} SpeexJitter;
-
-void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rate);
-
-void speex_jitter_destroy(SpeexJitter *jitter);
-
-void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int time);
-
-void speex_jitter_get(SpeexJitter *jitter, short *out);
-
-int speex_jitter_get_pointer_timestamp(SpeexJitter *jitter);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Deleted: trunk/speex/libspeex/speex_noglobals.h
===================================================================
--- trunk/speex/libspeex/speex_noglobals.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_noglobals.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,66 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin*/
-/**
-  @file speex_noglobals.h
-  @brief Describes the different modes of the codec
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef SPEEX_NOGLOBALS_H
-#define SPEEX_NOGLOBALS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Default narrowband mode */
-const SpeexMode * speex_nb_mode_new (void);
-void speex_nb_mode_free (const SpeexMode * mode);
-
-/** Default wideband mode */
-const SpeexMode * speex_wb_mode_new (void);
-void speex_wb_mode_free (const SpeexMode * mode);
-
-/** Default "ultra-wideband" mode */
-const SpeexMode * speex_uwb_mode_new (void);
-void speex_uwb_mode_free (const SpeexMode * mode);
-
-/** Query modes available */
-const SpeexMode * speex_mode_new_byID (int id);
-
-/** Free a mode, using its ID */
-void speex_mode_free_byID (SpeexMode * mode, int id);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Deleted: trunk/speex/libspeex/speex_preprocess.h
===================================================================
--- trunk/speex/libspeex/speex_preprocess.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_preprocess.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,145 +0,0 @@
-/* Copyright (C) 2003 Epic Games
-   Written by Jean-Marc Valin
-
-   File: speex_preprocess.h
-
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef SPEEX_PREPROCESS_H
-#define SPEEX_PREPROCESS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct drft_lookup;
-
-typedef struct SpeexPreprocessState {
-   int    frame_size;        /**< Number of samples processed each time */
-   int    ps_size;           /**< Number of points in the power spectrum */
-   int    sampling_rate;     /**< Sampling rate of the input/output */
-
-   /* parameters */
-   int    denoise_enabled;
-   int    agc_enabled;
-   float  agc_level;
-   int    vad_enabled;
-   int    dereverb_enabled;
-   float  reverb_decay;
-   float  reverb_level;
-
-   float *frame;             /**< Processing frame (2*ps_size) */
-   float *ps;                /**< Current power spectrum */
-   float *gain2;             /**< Adjusted gains */
-   float *window;            /**< Analysis/Synthesis window */
-   float *noise;             /**< Noise estimate */
-   float *reverb_estimate;   /**< Estimate of reverb energy */
-   float *old_ps;            /**< Power spectrum for last frame */
-   float *gain;              /**< Ephraim Malah gain */
-   float *prior;             /**< A-priori SNR */
-   float *post;              /**< A-posteriori SNR */
-
-   float *S;                 /**< Smoothed power spectrum */
-   float *Smin;              /**< See Cohen paper */
-   float *Stmp;              /**< See Cohen paper */
-   float *update_prob;       /**< Propability of speech presence for noise update */
-
-   float *zeta;              /**< Smoothed a priori SNR */
-   float  Zpeak;
-   float  Zlast;
-
-   float *loudness_weight;   /**< Perceptual loudness curve */
-
-   float *echo_noise;
-
-   float *noise_bands;
-   float *noise_bands2;
-   int    noise_bandsN;
-   float *speech_bands;
-   float *speech_bands2;
-   int    speech_bandsN;
-
-   float *inbuf;             /**< Input buffer (overlapped analysis) */
-   float *outbuf;            /**< Output buffer (for overlap and add) */
-
-   float  speech_prob;
-   int    last_speech;
-   float  loudness;          /**< loudness estimate */
-   float  loudness2;         /**< loudness estimate */
-   int    nb_adapt;          /**< Number of frames used for adaptation so far */
-   int    nb_loudness_adapt; /**< Number of frames used for loudness adaptation so far */
-   int    consec_noise;      /**< Number of consecutive noise frames */
-   int    nb_preprocess;     /**< Number of frames processed so far */
-   struct drft_lookup *fft_lookup;   /**< Lookup table for the FFT */
-
-} SpeexPreprocessState;
-
-/** Creates a new preprocessing state */
-SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampling_rate);
-
-/** Destroys a denoising state */
-void speex_preprocess_state_destroy(SpeexPreprocessState *st);
-
-/** Preprocess a frame */
-int speex_preprocess(SpeexPreprocessState *st, short *x, int *echo);
-
-/** Preprocess a frame */
-void speex_preprocess_estimate_update(SpeexPreprocessState *st, short *x, int *echo);
-
-/** Used like the ioctl function to control the preprocessor parameters */
-int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr);
-
-
-
-#define SPEEX_PREPROCESS_SET_DENOISE 0
-#define SPEEX_PREPROCESS_GET_DENOISE 1
-
-#define SPEEX_PREPROCESS_SET_AGC 2
-#define SPEEX_PREPROCESS_GET_AGC 3
-
-#define SPEEX_PREPROCESS_SET_VAD 4
-#define SPEEX_PREPROCESS_GET_VAD 5
-
-#define SPEEX_PREPROCESS_SET_AGC_LEVEL 6
-#define SPEEX_PREPROCESS_GET_AGC_LEVEL 7
-
-#define SPEEX_PREPROCESS_SET_DEREVERB 8
-#define SPEEX_PREPROCESS_GET_DEREVERB 9
-
-#define SPEEX_PREPROCESS_SET_DEREVERB_LEVEL 10
-#define SPEEX_PREPROCESS_GET_DEREVERB_LEVEL 11
-
-#define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12
-#define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

Deleted: trunk/speex/libspeex/speex_stereo.h
===================================================================
--- trunk/speex/libspeex/speex_stereo.h	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/speex_stereo.h	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,77 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin*/
-/**
-   @file speex_stereo.h
-   @brief Describes the handling for intensity stereo
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef STEREO_H
-#define STEREO_H
-
-#include "speex_bits.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** State used for decoding (intensity) stereo information */
-typedef struct SpeexStereoState {
-   float balance;      /**< Left/right balance info */
-   float e_ratio;      /**< Ratio of energies: E(left+right)/[E(left)+E(right)]  */
-   float smooth_left;  /**< Smoothed left channel gain */
-   float smooth_right; /**< Smoothed right channel gain */
-   float reserved1;    /**< Reserved for future use */
-   float reserved2;    /**< Reserved for future use */
-} SpeexStereoState;
-
-/** Initialization value for a stereo state */
-#define SPEEX_STEREO_STATE_INIT {1,.5,1,1}
-
-/** Transforms a stereo frame into a mono frame and stores intensity stereo info in 'bits' */
-void speex_encode_stereo(float *data, int frame_size, SpeexBits *bits);
-
-/** Transforms a stereo frame into a mono frame and stores intensity stereo info in 'bits' */
-void speex_encode_stereo_int(short *data, int frame_size, SpeexBits *bits);
-
-/** Transforms a mono frame into a stereo frame using intensity stereo info */
-void speex_decode_stereo(float *data, int frame_size, SpeexStereoState *stereo);
-
-/** Transforms a mono frame into a stereo frame using intensity stereo info */
-void speex_decode_stereo_int(short *data, int frame_size, SpeexStereoState *stereo);
-
-/** Callback handler for intensity stereo info */
-int speex_std_stereo_request_handler(SpeexBits *bits, void *state, void *data);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Modified: trunk/speex/libspeex/stereo.c
===================================================================
--- trunk/speex/libspeex/stereo.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/stereo.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -29,8 +29,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

-#include "speex_stereo.h"
-#include "speex_callbacks.h"
+#include <speex/speex_stereo.h>
+#include <speex/speex_callbacks.h>
#include "vq.h"
#include <math.h>


Modified: trunk/speex/libspeex/testdenoise.c
===================================================================
--- trunk/speex/libspeex/testdenoise.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/testdenoise.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,4 +1,4 @@
-#include "speex_preprocess.h"
+#include <speex/speex_preprocess.h>
#include <stdio.h>

#define NN 160

Modified: trunk/speex/libspeex/testecho.c
===================================================================
--- trunk/speex/libspeex/testecho.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/testecho.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,11 +1,11 @@
-#include "speex_echo.h"
+#include <speex/speex_echo.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include "speex_preprocess.h"
+#include <speex/speex_preprocess.h>

#define NN 160


Modified: trunk/speex/libspeex/testenc.c
===================================================================
--- trunk/speex/libspeex/testenc.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/testenc.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,7 +1,7 @@
-#include "speex.h"
+#include <speex/speex.h>
#include <stdio.h>
#include <stdlib.h>
-#include "speex_callbacks.h"
+#include <speex/speex_callbacks.h>

#ifdef FIXED_DEBUG
extern long long spx_mips;

Modified: trunk/speex/libspeex/testenc_uwb.c
===================================================================
--- trunk/speex/libspeex/testenc_uwb.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/testenc_uwb.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,7 +1,7 @@
-#include "speex.h"
+#include <speex/speex.h>
#include <stdio.h>
#include <stdlib.h>
-#include "speex_callbacks.h"
+#include <speex/speex_callbacks.h>

#ifdef FIXED_DEBUG
extern long long spx_mips;

Modified: trunk/speex/libspeex/testenc_wb.c
===================================================================
--- trunk/speex/libspeex/testenc_wb.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/libspeex/testenc_wb.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -1,7 +1,7 @@
-#include "speex.h"
+#include <speex/speex.h>
#include <stdio.h>
#include <stdlib.h>
-#include "speex_callbacks.h"
+#include <speex/speex_callbacks.h>

#ifdef FIXED_DEBUG
extern long long spx_mips;

Added: trunk/speex/speex.m4
===================================================================
--- trunk/speex/speex.m4	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/speex.m4	2004-07-14 03:50:57 UTC (rev 7113)
@@ -0,0 +1,104 @@
+# Configure paths for libspeex
+# Jean-Marc Valin <jean-marc.valin at usherbrooke.ca>
+# Shamelessly stolen from:
+# Jack Moffitt <jack at icecast.org> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl XIPH_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS
+dnl
+AC_DEFUN(XIPH_PATH_SPEEX,
+[dnl
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(speex,[  --with-speex=PFX   Prefix where libspeex is installed (optional)], speex_prefix="$withval", speex_prefix="")
+AC_ARG_WITH(speex-libraries,[  --with-speex-libraries=DIR   Directory where libspeex library is installed (optional)], speex_libraries="$withval", speex_libraries="")
+AC_ARG_WITH(speex-includes,[  --with-speex-includes=DIR   Directory where libspeex header files are installed (optional)], speex_includes="$withval", speex_includes="")
+AC_ARG_ENABLE(speextest, [  --disable-speextest       Do not try to compile and run a test Speex program],, enable_speextest=yes)
+
+  if test "x$speex_libraries" != "x" ; then
+    SPEEX_LIBS="-L$speex_libraries"
+  elif test "x$speex_prefix" != "x" ; then
+    SPEEX_LIBS="-L$speex_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    SPEEX_LIBS="-L$prefix/lib"
+  fi
+
+  SPEEX_LIBS="$SPEEX_LIBS -lspeex"
+
+  if test "x$speex_includes" != "x" ; then
+    SPEEX_CFLAGS="-I$speex_includes"
+  elif test "x$speex_prefix" != "x" ; then
+    SPEEX_CFLAGS="-I$speex_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    SPEEX_CFLAGS="-I$prefix/include"
+  fi
+
+  AC_MSG_CHECKING(for Speex)
+  no_speex=""
+
+
+  if test "x$enable_speextest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $SPEEX_CFLAGS"
+    LIBS="$LIBS $SPEEX_LIBS"
+dnl
+dnl Now check if the installed Speex is sufficiently new.
+dnl
+      rm -f conf.speextest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <speex/speex.h>
+
+int main ()
+{
+  system("touch conf.speextest");
+  return 0;
+}
+
+],, no_speex=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_speex" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.speextest ; then
+       :
+     else
+       echo "*** Could not run Speex test program, checking why..."
+       CFLAGS="$CFLAGS $SPEEX_CFLAGS"
+       LIBS="$LIBS $SPEEX_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <speex/speex.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Speex or finding the wrong"
+       echo "*** version of Speex. If it is not finding Speex, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Speex was incorrectly installed"
+       echo "*** or that you have moved Speex since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     SPEEX_CFLAGS=""
+     SPEEX_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(SPEEX_CFLAGS)
+  AC_SUBST(SPEEX_LIBS)
+  rm -f conf.speextest
+])

Added: trunk/speex/speex.pc.in
===================================================================
--- trunk/speex/speex.pc.in	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/speex.pc.in	2004-07-14 03:50:57 UTC (rev 7113)
@@ -0,0 +1,14 @@
+# libogg pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: speex
+Description: Speex is an audio codec tuned for speech
+Version: @SPEEX_VERSION@
+Requires: ogg
+Conflicts:
+Libs: -L${libdir} -lspeex
+Cflags: -I${includedir}

Modified: trunk/speex/src/Makefile.am
===================================================================
--- trunk/speex/src/Makefile.am	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/src/Makefile.am	2004-07-14 03:50:57 UTC (rev 7113)
@@ -5,7 +5,7 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies

-INCLUDES = -I$(top_srcdir)/libspeex $(OGG_INCLUDES)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libspeex $(OGG_INCLUDES)

mandir = $(prefix)/share/man
man_MANS = speexenc.1 speexdec.1

Modified: trunk/speex/src/speexdec.c
===================================================================
--- trunk/speex/src/speexdec.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/src/speexdec.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -40,8 +40,8 @@
#include <stdlib.h>
#include <string.h>

-#include "speex.h"
-#include "ogg/ogg.h"
+#include <speex/speex.h>
+#include <ogg/ogg.h>

#if defined WIN32 || defined _WIN32
#include <windows.h>
@@ -77,9 +77,9 @@

#include <string.h>
#include "wav_io.h"
-#include "speex_header.h"
-#include "speex_stereo.h"
-#include "speex_callbacks.h"
+#include <speex/speex_header.h>
+#include <speex/speex_stereo.h>
+#include <speex/speex_callbacks.h>
#include "misc.h"

#define MAX_FRAME_SIZE 2000

Modified: trunk/speex/src/speexenc.c
===================================================================
--- trunk/speex/src/speexenc.c	2004-07-14 03:03:09 UTC (rev 7112)
+++ trunk/speex/src/speexenc.c	2004-07-14 03:50:57 UTC (rev 7113)
@@ -41,13 +41,13 @@
#include <string.h>
#include <time.h>

-#include "speex.h"
+#include <speex/speex.h>
#include <ogg/ogg.h>
#include "wav_io.h"
-#include "speex_header.h"
-#include "speex_stereo.h"
+#include <speex/speex_header.h>
+#include <speex/speex_stereo.h>
#include "misc.h"
-#include "speex_preprocess.h"
+#include <speex/speex_preprocess.h>

#if defined WIN32 || defined _WIN32
#include "getopt_win.h"



More information about the commits mailing list