--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -78,17 +78,16 @@ media/libspeex_resampler/.*
 media/libstagefright/.*
 media/libtheora/.*
 media/libtremor/.*
 media/libvorbis/.*
 media/libvpx/.*
 media/libyuv/.*
 media/mtransport/third_party/.*
 media/openmax_dl/.*
-media/sphinxbase/.*
 media/webrtc/signaling/src/sdp/sipcc/.*
 media/webrtc/trunk/.*
 mfbt/decimal/.*
 mfbt/double-conversion/double-conversion/.*
 mobile/android/geckoview/src/thirdparty/.*
 mobile/android/thirdparty/.*
 modules/brotli/.*
 modules/fdlibm/.*

--- a/dom/media/webspeech/recognition/moz.build
+++ b/dom/media/webspeech/recognition/moz.build
@@ -41,17 +41,16 @@ UNIFIED_SOURCES += [
 
 if CONFIG['MOZ_WEBSPEECH_TEST_BACKEND']:
     UNIFIED_SOURCES += [
         'test/FakeSpeechRecognitionService.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '/dom/base',
-    '/media/sphinxbase',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']

deleted file mode 100644
--- a/media/sphinxbase/config.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#if (  defined(_WIN32) || defined(__CYGWIN__) )
-/* include/sphinx_config.h, defaults for Win32 */
-/* sphinx_config.h: Externally visible configuration parameters for
- * SphinxBase.
- */
-
-/* Default radix point for fixed-point */
-/* #undef DEFAULT_RADIX */
-
-/* Enable thread safety */
-#define ENABLE_THREADS 
-
-/* The Thread Local Storage class */
-#define SPHINXBASE_TLS __declspec(thread)
-
-/* Use Q15 fixed-point computation */
-/* #undef FIXED16 */
-
-/* Use fixed-point computation */
-/* #undef FIXED_POINT */
-
-/* Enable matrix algebra with LAPACK */
-#define WITH_LAPACK
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* We don't have popen, but we do have _popen */
-/* #define HAVE_POPEN 1 */
-
-/* We do have perror */
-#define HAVE_PERROR 1
-
-/* We have sys/stat.h */
-#define HAVE_SYS_STAT_H 1
-
-/* We do not have unistd.h. */
-#define YY_NO_UNISTD_H 1
-
-/* Extension for executables */
-#define EXEEXT ".exe"
-#else
-/* include/config.h.  Generated from config.h.in by configure.  */
-/* include/config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Default radix point for fixed-point */
-/* #undef DEFAULT_RADIX */
-
-/* Enable thread safety */
-#define ENABLE_THREADS /**/
-
-/* Use Q15 fixed-point computation */
-/* #undef FIXED16 */
-
-/* Use fixed-point computation */
-/* #undef FIXED_POINT */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if you have the iconv() function. */
-/* #define HAVE_ICONV 1 */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `asound' library (-lasound). */
-/* #define HAVE_LIBASOUND 1 */
-
-/* Define to 1 if you have the `blas' library (-lblas). */
-/* #define HAVE_LIBBLAS 1 */
-
-/* Define to 1 if you have the `lapack' library (-llapack). */
-/* #define HAVE_LIBLAPACK 1 */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#define HAVE_LIBPTHREAD 1
-
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `perror' function. */
-#define HAVE_PERROR 1
-
-/* Define to 1 if you have the `popen' function. */
-#define HAVE_POPEN 1
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#define HAVE_PTHREAD_H 1
-
-/* Define to 1 if you have the <sndfile.h> header file. */
-#define HAVE_SNDFILE_H 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST 
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* Enable debugging output */
-/* #undef SPHINX_DEBUG */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Enable matrix algebra with LAPACK */
-/* #define WITH_LAPACK */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-#endif

deleted file mode 100644
--- a/media/sphinxbase/moz.build
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Core", "Web Speech")
-
-EXPORTS.sphinxbase += [
-    'sphinxbase/cmd_ln.h',
-    'sphinxbase/fe.h',
-    'sphinxbase/feat.h',
-    'sphinxbase/logmath.h',
-]
-
-SOURCES += [
-    'src/libsphinxbase/fe/fe_interface.c',
-    'src/libsphinxbase/fe/fe_noise.c',
-    'src/libsphinxbase/fe/fe_prespch_buf.c',
-    'src/libsphinxbase/fe/fe_sigproc.c',
-    'src/libsphinxbase/fe/fe_warp.c',
-    'src/libsphinxbase/fe/fe_warp_affine.c',
-    'src/libsphinxbase/fe/fe_warp_inverse_linear.c',
-    'src/libsphinxbase/fe/fe_warp_piecewise_linear.c',
-    'src/libsphinxbase/fe/fixlog.c',
-    'src/libsphinxbase/fe/yin.c',
-    'src/libsphinxbase/feat/agc.c',
-    'src/libsphinxbase/feat/cmn.c',
-    'src/libsphinxbase/feat/cmn_prior.c',
-    'src/libsphinxbase/feat/feat.c',
-    'src/libsphinxbase/feat/lda.c',
-    'src/libsphinxbase/lm/fsg_model.c',
-    'src/libsphinxbase/lm/jsgf.c',
-    'src/libsphinxbase/lm/jsgf_parser.c',
-    'src/libsphinxbase/lm/jsgf_scanner.c',
-    'src/libsphinxbase/lm/lm3g_model.c',
-    'src/libsphinxbase/lm/ngram_model.c',
-    'src/libsphinxbase/lm/ngram_model_arpa.c',
-    'src/libsphinxbase/lm/ngram_model_dmp.c',
-    'src/libsphinxbase/lm/ngram_model_set.c',
-    'src/libsphinxbase/util/bio.c',
-    'src/libsphinxbase/util/bitvec.c',
-    'src/libsphinxbase/util/blas_lite.c',
-    'src/libsphinxbase/util/case.c',
-    'src/libsphinxbase/util/ckd_alloc.c',
-    'src/libsphinxbase/util/cmd_ln.c',
-    'src/libsphinxbase/util/dtoa.c',
-    'src/libsphinxbase/util/err.c',
-    'src/libsphinxbase/util/errno.c',
-    'src/libsphinxbase/util/f2c_lite.c',
-    'src/libsphinxbase/util/filename.c',
-    'src/libsphinxbase/util/genrand.c',
-    'src/libsphinxbase/util/glist.c',
-    'src/libsphinxbase/util/hash_table.c',
-    'src/libsphinxbase/util/heap.c',
-    'src/libsphinxbase/util/huff_code.c',
-    'src/libsphinxbase/util/listelem_alloc.c',
-    'src/libsphinxbase/util/logmath.c',
-    'src/libsphinxbase/util/matrix.c',
-    'src/libsphinxbase/util/mmio.c',
-    'src/libsphinxbase/util/pio.c',
-    'src/libsphinxbase/util/profile.c',
-    'src/libsphinxbase/util/sbthread.c',
-    'src/libsphinxbase/util/slamch.c',
-    'src/libsphinxbase/util/slapack_lite.c',
-    'src/libsphinxbase/util/strfuncs.c',
-    'src/libsphinxbase/util/utf8.c',
-]
-
-# Suppress warnings in third-party code.
-if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-    CFLAGS += [
-        '-Wno-parentheses',
-        '-Wno-sign-compare',
-    ]
-
-# Add define required of third party code.
-if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-    DEFINES['HAVE_CONFIG_H'] = True
-
-# We allow warnings for third-party code that can be updated from upstream.
-AllowCompilerWarnings()
-
-FINAL_LIBRARY = 'gkmedias'

deleted file mode 100644
--- a/media/sphinxbase/pocketsphinx-COPYING.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999-2015 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
- 

deleted file mode 100644
--- a/media/sphinxbase/sbthread.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git b/src/libsphinxbase/util/sbthread.c a/src/libsphinxbase/util/sbthread.c
-index 14207cb..2f82c76 100644
---- b/src/libsphinxbase/util/sbthread.c
-+++ a/src/libsphinxbase/util/sbthread.c
-@@ -51,7 +51,9 @@
-  * Platform-specific parts: threads, mutexes, and signals.
-  */
- #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(__SYMBIAN32__)
-+#ifndef _WIN32_WINNT
- #define _WIN32_WINNT 0x0400
-+#endif /* not _WIN32_WINNT */
- #include <windows.h>
- 
- struct sbthread_s {

deleted file mode 100644
--- a/media/sphinxbase/sphinx_config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#if (  defined(_WIN32) || defined(__CYGWIN__) )
-/* include/sphinx_config.h, defaults for Win32 */
-/* sphinx_config.h: Externally visible configuration parameters for
- * SphinxBase.
- */
-
-/* Default radix point for fixed-point */
-/* #undef DEFAULT_RADIX */
-
-/* Use Q15 fixed-point computation */
-/* #undef FIXED16 */
-
-/* Use fixed-point computation */
-/* #undef FIXED_POINT */
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-#else
-/* include/sphinx_config.h.  Generated from sphinx_config.h.in by configure.  */
-/* sphinx_config.h: Externally visible configuration parameters */
-
-/* Default radix point for fixed-point */
-/* #undef DEFAULT_RADIX */
-
-/* Use Q15 fixed-point computation */
-/* #undef FIXED16 */
-
-/* Use fixed-point computation */
-/* #undef FIXED_POINT */
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* Define to 1 if the system has the type `long long'. */
-/*#define HAVE_LONG_LONG 1*/
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* Enable debugging output */
-/* #undef SPHINX_DEBUG */
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/ad.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2014 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/** \file ad.h
- * \brief generic live audio interface for recording and playback
- */
-
-#ifndef _AD_H_
-#define _AD_H_
-
-#include <sphinx_config.h>
-
-#include <sphinxbase/sphinxbase_export.h>
-#include <sphinxbase/prim_type.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-#define DEFAULT_SAMPLES_PER_SEC	16000
-
-/* Return codes */
-#define AD_OK		0
-#define AD_EOF		-1
-#define AD_ERR_GEN	-1
-#define AD_ERR_NOT_OPEN	-2
-#define AD_ERR_WAVE	-3
-
-typedef struct ad_rec_s ad_rec_t;
-
-/**
- * Open a specific audio device for recording.
- *
- * The device is opened in non-blocking mode and placed in idle state.
- *
- * @return pointer to read-only ad_rec_t structure if successful, NULL
- * otherwise.  The return value to be used as the first argument to
- * other recording functions.
- */
-SPHINXBASE_EXPORT
-ad_rec_t *ad_open_dev (
-	const char *dev, /**< Device name (platform-specific) */
-	int32 samples_per_sec /**< Samples per second */
-	);
-
-/**
- * Open the default audio device with a given sampling rate.
- */
-SPHINXBASE_EXPORT
-ad_rec_t *ad_open_sps (
-		       int32 samples_per_sec /**< Samples per second */
-		       );
-
-
-/**
- * Open the default audio device.
- */
-SPHINXBASE_EXPORT
-ad_rec_t *ad_open ( void );
-
-
-/* Start audio recording.  Return value: 0 if successful, <0 otherwise */
-SPHINXBASE_EXPORT
-int32 ad_start_rec (ad_rec_t *);
-
-
-/* Stop audio recording.  Return value: 0 if successful, <0 otherwise */
-SPHINXBASE_EXPORT
-int32 ad_stop_rec (ad_rec_t *);
-
-
-/* Close the recording device.  Return value: 0 if successful, <0 otherwise */
-SPHINXBASE_EXPORT
-int32 ad_close (ad_rec_t *);
-
-/*
- * Read next block of audio samples while recording; read upto max samples into buf.
- * Return value: # samples actually read (could be 0 since non-blocking); -1 if not
- * recording and no more samples remaining to be read from most recent recording.
- */
-SPHINXBASE_EXPORT
-int32 ad_read (ad_rec_t *, int16 *buf, int32 max);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/agc.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/*
- * agc.h -- Various forms of automatic gain control (AGC)
- * 
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1999 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * $Log$
- * Revision 1.1  2006/04/05  20:27:30  dhdfu
- * A Great Reorganzation of header files and executables
- * 
- * Revision 1.8  2005/06/21 19:25:41  arthchan2003
- * 1, Fixed doxygen documentation. 2, Added $ keyword.
- *
- * Revision 1.4  2005/06/13 04:02:56  archan
- * Fixed most doxygen-style documentation under libs3decoder.
- *
- * Revision 1.3  2005/03/30 01:22:46  archan
- * Fixed mistakes in last updates. Add
- *
- * 
- * 28-Apr-1999	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Copied from previous version.
- */
-
-
-#ifndef _S3_AGC_H_
-#define _S3_AGC_H_
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-
-#include <sphinxbase/prim_type.h>
-#include <sphinxbase/fe.h>
-
-/** \file agc.h
- *  \brief routine that implements automatic gain control
- *  
- *  \warning This function may not be fully compatible with
- *  SphinxTrain's family of AGC. 
- *
- *  This implements AGC. 
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-/**
- * Types of acoustic gain control to apply to the features.
- */
-typedef enum agc_type_e {
-    AGC_NONE = 0,
-    AGC_MAX,
-    AGC_EMAX,
-    AGC_NOISE
-} agc_type_t;
-
-/** Convert string representation (from command-line) to agc_type_t */
-SPHINXBASE_EXPORT
-agc_type_t agc_type_from_str(const char *str);
-
-/** String representations of agc_type_t values. */
-SPHINXBASE_EXPORT
-extern const char *agc_type_str[];
-
-/**
- * Structure holding data for doing AGC.
- **/
-typedef struct agc_s {
-    mfcc_t max;      /**< Estimated max for current utterance (for AGC_EMAX) */
-    mfcc_t obs_max;  /**< Observed max in current utterance */
-    int32 obs_frame; /**< Whether any data was observed after prev update */
-    int32 obs_utt;   /**< Whether any utterances have been observed */
-    mfcc_t obs_max_sum;
-    mfcc_t noise_thresh; /**< Noise threshold (for AGC_NOISE only) */
-} agc_t;
-
-/**
- * Initialize AGC structure with default values.
- */
-SPHINXBASE_EXPORT
-agc_t *agc_init(void);
-
-/**
- * Free AGC structure.
- */
-SPHINXBASE_EXPORT
-void agc_free(agc_t *agc);
-
-/**
- * Apply AGC to the given mfc vectors (normalize all C0 mfc coefficients in the given
- * input such that the max C0 value is 0, by subtracting the input max C0 from all).
- * This function operates on an entire utterance at a time.  Hence, the entire utterance
- * must be available beforehand (batchmode).
- */
-SPHINXBASE_EXPORT
-void agc_max(agc_t *agc,	/**< In: AGC structure (not used) */
-             mfcc_t **mfc,	/**< In/Out: mfc[f] = cepstrum vector in frame f */
-             int32 n_frame	/**< In: number of frames of cepstrum vectors supplied */
-    );
-
-/**
- * Apply AGC to the given block of MFC vectors. 
- * Unlike agc_max() this does not require the entire utterance to be
- * available.  Call agc_emax_update() at the end of each utterance to
- * update the AGC parameters. */
-SPHINXBASE_EXPORT
-void agc_emax(agc_t *agc,	/**< In: AGC structure */
-              mfcc_t **mfc,	/**< In/Out: mfc[f] = cepstrum vector in frame f */
-              int32 n_frame	/**< In: number of frames of cepstrum vectors supplied */
-    );
-
-/**
- * Update AGC parameters for next utterance.
- **/
-SPHINXBASE_EXPORT
-void agc_emax_update(agc_t *agc /**< In: AGC structure */
-    );
-
-/**
- * Get the current AGC maximum estimate.
- **/
-SPHINXBASE_EXPORT
-float32 agc_emax_get(agc_t *agc);
-
-/**
- * Set the current AGC maximum estimate.
- **/
-SPHINXBASE_EXPORT
-void agc_emax_set(agc_t *agc, float32 m);
-
-/**
- * Apply AGC using noise threshold to the given block of MFC vectors. 
- **/
-SPHINXBASE_EXPORT
-void agc_noise(agc_t *agc,	/**< In: AGC structure */
-               mfcc_t **mfc,	/**< In/Out: mfc[f] = cepstrum vector in frame f */
-               int32 n_frame	/**< In: number of frames of cepstrum vectors supplied */
-    );
-
-/**
- * Get the current AGC noise threshold.
- **/
-SPHINXBASE_EXPORT
-float32 agc_get_threshold(agc_t *agc);
-
-/**
- * Set the current AGC noise threshold.
- **/
-SPHINXBASE_EXPORT
-void agc_set_threshold(agc_t *agc, float32 threshold);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/bio.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/*
- * bio.h -- Sphinx-3 binary file I/O functions.
- * 
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1996 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * $Log: bio.h,v $
- * Revision 1.8  2005/06/21 20:40:46  arthchan2003
- * 1, Fixed doxygen documentation, 2, Add the $ keyword.
- *
- * Revision 1.5  2005/06/13 04:02:57  archan
- * Fixed most doxygen-style documentation under libs3decoder.
- *
- * Revision 1.4  2005/05/10 21:21:52  archan
- * Three functionalities added but not tested. Code on 1) addition/deletion of LM in mode 4. 2) reading text-based LM 3) Converting txt-based LM to dmp-based LM.
- *
- * Revision 1.3  2005/03/30 01:22:46  archan
- * Fixed mistakes in last updates. Add
- *
- * 
- * 28-Apr-1999	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Created.
- */
-
-
-#ifndef _S3_BIO_H_
-#define _S3_BIO_H_
-
-#include <stdio.h>
-#include <stdarg.h>
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-#include <sphinxbase/prim_type.h>
-#include <sphinxbase/byteorder.h>
-
-/** \file bio.h
- * \brief Cross platform binary IO to process files in sphinx3 format. 
- * 
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-#define BYTE_ORDER_MAGIC	(0x11223344)
-
-/** "reversed senses" SWAP, ARCHAN: This is still incorporated in
-    Sphinx 3 because lm3g2dmp used it.  Don't think that I am very
-    happy with it. */
-
-#if (__BIG_ENDIAN__)
-#define REVERSE_SENSE_SWAP_INT16(x)  x = ( (((x)<<8)&0x0000ff00) | (((x)>>8)&0x00ff) )
-#define REVERSE_SENSE_SWAP_INT32(x)  x = ( (((x)<<24)&0xff000000) | (((x)<<8)&0x00ff0000) | \
-                         (((x)>>8)&0x0000ff00) | (((x)>>24)&0x000000ff) )
-#else
-#define REVERSE_SENSE_SWAP_INT16(x)
-#define REVERSE_SENSE_SWAP_INT32(x)
-
-#endif
-
-
-
-/**
- * Read binary file format header: has the following format
- * <pre>
- *     s3
- *     <argument-name> <argument-value>
- *     <argument-name> <argument-value>
- *     ...
- *     endhdr
- *     4-byte byte-order word used to find file byte ordering relative to host machine.
- * </pre>
- * Lines beginning with # are ignored.
- * Memory for name and val allocated by this function; use bio_hdrarg_free to free them.
- * @return 0 if successful, -1 otherwise.
- */
-SPHINXBASE_EXPORT
-int32 bio_readhdr (FILE *fp,		/**< In: File to read */
-		   char ***name,	/**< Out: array of argument name strings read */
-		   char ***val,		/**< Out: corresponding value strings read */
-		   int32 *swap	/**< Out: file needs byteswapping iff (*swap) */
-		   );
-/**
- * Write a simple binary file header, containing only the version string.  Also write
- * the byte order magic word.
- * @return 0 if successful, -1 otherwise.
- */
-SPHINXBASE_EXPORT
-int32 bio_writehdr_version (FILE *fp,  /**< Output: File to write */
-			    char *version /**< Input: A string of version */
-	);
-
-
-/**
- * Write a simple binary file header with only byte order magic word.
- * @return 0 if successful, -1 otherwise.
- */
-SPHINXBASE_EXPORT
-int32 bio_writehdr(FILE *fp, ...);
-
-/**
- * Free name and value strings previously allocated and returned by bio_readhdr.
- */
-SPHINXBASE_EXPORT
-void bio_hdrarg_free (char **name,	/**< In: Array previously returned by bio_readhdr */
-		      char **val	/**< In: Array previously returned by bio_readhdr */
-		      );
-
-/**
- * Like fread but perform byteswapping and accumulate checksum (the 2 extra arguments).
- *
- * @return unlike fread, returns -1 if required number of elements (n_el) not read; also,
- * no byteswapping or checksum accumulation is performed in that case.
- */
-SPHINXBASE_EXPORT
-int32 bio_fread (void *buf,		/**< In: buffer to write */
-		 int32 el_sz,		/**< In: element size */
-		 int32 n_el,		/**< In: number of elements */
-		 FILE *fp,              /**< In: An input file pointer */
-		 int32 swap,		/**< In: Byteswap iff (swap != 0) */
-		 uint32 *chksum	/**< In/Out: Accumulated checksum */
-		 );
-
-/**
- * Like fwrite but perform byteswapping and accumulate checksum (the 2 extra arguments).
- *
- * @return the number of elemens written (like fwrite).
- */
-SPHINXBASE_EXPORT
-int32 bio_fwrite(const void *buf,	/**< In: buffer to write */
-		 int32 el_sz,		/**< In: element size */
-		 int32 n_el,		/**< In: number of elements */
-		 FILE *fp,              /**< In: An input file pointer */
-		 int32 swap,		/**< In: Byteswap iff (swap != 0) */
-		 uint32 *chksum	/**< In/Out: Accumulated checksum */
-		 );
-
-/**
- * Read a 1-d array (fashioned after fread):
- *
- *  - 4-byte array size (returned in n_el)
- *  - memory allocated for the array and read (returned in buf)
- * 
- * Byteswapping and checksum accumulation performed as necessary.
- * Fails fatally if expected data not read.
- * @return number of array elements allocated and read; -1 if error.
- */
-SPHINXBASE_EXPORT
-int32 bio_fread_1d (void **buf,		/**< Out: contains array data; allocated by this
-					   function; can be freed using ckd_free */
-		    size_t el_sz,	/**< In: Array element size */
-		    uint32 *n_el,	/**< Out: Number of array elements allocated/read */
-		    FILE *fp,		/**< In: File to read */
-		    int32 sw,		/**< In: Byteswap iff (swap != 0) */
-		    uint32 *ck	/**< In/Out: Accumulated checksum */
-		    );
-
-/**
- * Read a 2-d matrix:
- *
- * - 4-byte # rows, # columns (returned in d1, d2, d3)
- * - memory allocated for the array and read (returned in buf)
- *
- * Byteswapping and checksum accumulation performed as necessary.
- * Fails fatally if expected data not read.
- * @return number of array elements allocated and read; -1 if error.
- */
-SPHINXBASE_EXPORT
-int32 bio_fread_2d(void ***arr,
-                   size_t e_sz,
-                   uint32 *d1,
-                   uint32 *d2,
-                   FILE *fp,
-                   uint32 swap,
-                   uint32 *chksum);
-
-/**
- * Read a 3-d array (set of matrices)
- *
- * - 4-byte # matrices, # rows, # columns (returned in d1, d2, d3)
- * - memory allocated for the array and read (returned in buf)
- *
- * Byteswapping and checksum accumulation performed as necessary.
- * Fails fatally if expected data not read.
- * @return number of array elements allocated and read; -1 if error.
- */
-SPHINXBASE_EXPORT
-int32 bio_fread_3d(void ****arr,
-                   size_t e_sz,
-                   uint32 *d1,
-                   uint32 *d2,
-                   uint32 *d3,
-                   FILE *fp,
-                   uint32 swap,
-                   uint32 *chksum);
-
-/**
- * Read and verify checksum at the end of binary file.  Fails fatally if there is
- * a mismatch.
- */
-SPHINXBASE_EXPORT
-void bio_verify_chksum (FILE *fp,	/**< In: File to read */
-			int32 byteswap,	/**< In: Byteswap iff (swap != 0) */
-			uint32 chksum	/**< In: Value to compare with checksum in file */
-			);
-
-
-
-/**
- * Write a 1-d array.
- * Checksum accumulation performed as necessary.
- *
- * @return number of array elements successfully written or -1 if error.
- */
-SPHINXBASE_EXPORT
-int bio_fwrite_1d(void *arr,       /**< In: Data to write */
-                  size_t e_sz,     /**< In: Size of the elements in bytes */
-                  uint32 d1,       /**< In: First dimension */
-                  FILE *fp,        /**< In: File to write to */
-                  uint32 *chksum   /**< In/Out: Checksum accumulator */
-                  );
-
-/**
- * Write a 3-d array (set of matrices).
- * Checksum accumulation performed as necessary.
- *
- * @return number of array elements successfully written or -1 if error.
- */
-SPHINXBASE_EXPORT
-int bio_fwrite_3d(void ***arr,    /**< In: Data to write */
-                  size_t e_sz,    /**< In: Size of the elements in bytes */
-                  uint32 d1,      /**< In: First dimension */
-                  uint32 d2,      /**< In: Second dimension */
-                  uint32 d3,      /**< In: Third dimension */
-                  FILE *fp,       /**< In: File to write to */
-                  uint32 *chksum  /**< In/Out: Checksum accumulator */
-                  );
-
-/**
- * Read raw data from the wav file.
- *
- * @return pointer to the data.
- */
-SPHINXBASE_EXPORT
-int16* bio_read_wavfile(char const *directory, /**< In: the folder where the file is located */
-			char const *filename,  /**< In: the name of the file */
-			char const *extension, /**< In: file extension */
-			int32 header,          /**< In: the size of the header to skip usually 44 bytes */
-			int32 endian,          /**< In: endian of the data */
-			size_t *nsamps         /**< Out: number of samples read */
-			);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/bitvec.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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 _LIBUTIL_BITVEC_H_
-#define _LIBUTIL_BITVEC_H_
-
-#include <string.h>
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-
-#include <sphinxbase/prim_type.h>
-#include <sphinxbase/ckd_alloc.h>
-
-/** 
- * @file bitvec.h
- * @brief An implementation of bit vectors.
- * 
- * Implementation of basic operations of bit vectors.  
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-#define BITVEC_BITS 32
-typedef uint32 bitvec_t;
-
-/**
- * Number of bitvec_t in a bit vector
- */
-#define bitvec_size(n)	        (((n)+BITVEC_BITS-1)/BITVEC_BITS)
-
-/**
- * Allocate a bit vector, all bits are clear
- */
-#define bitvec_alloc(n)		ckd_calloc(bitvec_size(n), sizeof(bitvec_t))
-
-/**
- * Resize a bit vector, clear the remaining bits
- */
-SPHINXBASE_EXPORT
-bitvec_t *bitvec_realloc(bitvec_t *vec,	/* In: Bit vector to search */
-			 size_t old_len, /* In: Old length */
-                         size_t new_len); /* In: New lenght of above bit vector */
-/**
- * Free a bit vector.
- */
-#define bitvec_free(v)		ckd_free(v)
-
-/**
- * Set the b-th bit of bit vector v
- * @param v is a vector
- * @param b is the bit which will be set
- */
-
-#define bitvec_set(v,b)		(v[(b)/BITVEC_BITS] |= (1UL << ((b) & (BITVEC_BITS-1))))
-
-/**
- * Set all n bits in bit vector v
- * @param v is a vector
- * @param n is the number of bits
- */
-
-#define bitvec_set_all(v,n)	memset(v, (bitvec_t)-1, \
-                                       (((n)+BITVEC_BITS-1)/BITVEC_BITS) * \
-                                       sizeof(bitvec_t))
-/**
- * Clear the b-th bit of bit vector v
- * @param v is a vector
- * @param b is the bit which will be set
- */
-
-#define bitvec_clear(v,b)	(v[(b)/BITVEC_BITS] &= ~(1UL << ((b) & (BITVEC_BITS-1))))
-
-/**
- * Clear all n bits in bit vector v
- * @param v is a vector
- * @param n is the number of bits
- */
-
-#define bitvec_clear_all(v,n)	memset(v, 0, (((n)+BITVEC_BITS-1)/BITVEC_BITS) * \
-                                       sizeof(bitvec_t))
-
-/**
- * Check whether the b-th bit is set in vector v
- * @param v is a vector
- * @param b is the bit which will be checked
- */
-
-#define bitvec_is_set(v,b)	(v[(b)/BITVEC_BITS] & (1UL << ((b) & (BITVEC_BITS-1))))
-
-/**
- * Check whether the b-th bit is cleared in vector v
- * @param v is a vector
- * @param b is the bit which will be checked
- */
-
-#define bitvec_is_clear(v,b)	(! (bitvec_is_set(v,b)))
-
-
-/**
- * Return the number of bits set in the given bitvector.
- *
- * @param vec is the bit vector
- * @param len is the length of bit vector <code>vec</code>
- * @return the number of bits being set in vector <code>vec</code>
- */
-SPHINXBASE_EXPORT
-size_t bitvec_count_set(bitvec_t *vec,	/* In: Bit vector to search */
-                        size_t len);	/* In: Lenght of above bit vector */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/byteorder.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2001 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-
-/*
- * byteorder.h -- Byte swapping ordering macros.
- * 
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1996 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * 
- * $Log: byteorder.h,v $
- * Revision 1.8  2005/09/01 21:09:54  dhdfu
- * Really, actually, truly consolidate byteswapping operations into
- * byteorder.h.  Where unconditional byteswapping is needed, SWAP_INT32()
- * and SWAP_INT16() are to be used.  The WORDS_BIGENDIAN macro from
- * autoconf controls the functioning of the conditional swap macros
- * (SWAP_?[LW]) whose names and semantics have been regularized.
- * Private, adhoc macros have been removed.
- *
- */
-
-#ifndef __S2_BYTEORDER_H__
-#define __S2_BYTEORDER_H__	1
-
-/* Macro to byteswap an int16 variable.  x = ptr to variable */
-#define SWAP_INT16(x)	*(x) = ((0x00ff & (*(x))>>8) | (0xff00 & (*(x))<<8))
-
-/* Macro to byteswap an int32 variable.  x = ptr to variable */
-#define SWAP_INT32(x)	*(x) = ((0x000000ff & (*(x))>>24) | \
-				(0x0000ff00 & (*(x))>>8) | \
-				(0x00ff0000 & (*(x))<<8) | \
-				(0xff000000 & (*(x))<<24))
-
-/* Macro to byteswap a float32 variable.  x = ptr to variable */
-#define SWAP_FLOAT32(x)	SWAP_INT32((int32 *) x)
-
-/* Macro to byteswap a float64 variable.  x = ptr to variable */
-#define SWAP_FLOAT64(x)	{ int *low = (int *) (x), *high = (int *) (x) + 1,\
-			      temp;\
-			  SWAP_INT32(low);  SWAP_INT32(high);\
-			  temp = *low; *low = *high; *high = temp;}
-
-#ifdef WORDS_BIGENDIAN
-#define SWAP_BE_64(x)
-#define SWAP_BE_32(x)
-#define SWAP_BE_16(x)
-#define SWAP_LE_64(x) SWAP_FLOAT64(x)
-#define SWAP_LE_32(x) SWAP_INT32(x)
-#define SWAP_LE_16(x) SWAP_INT16(x)
-#else
-#define SWAP_LE_64(x)
-#define SWAP_LE_32(x)
-#define SWAP_LE_16(x)
-#define SWAP_BE_64(x) SWAP_FLOAT64(x)
-#define SWAP_BE_32(x) SWAP_INT32(x)
-#define SWAP_BE_16(x) SWAP_INT16(x)
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/case.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/*
- * case.h -- Upper/lower case conversion routines
- *
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1999 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * $Log: case.h,v $
- * Revision 1.7  2005/06/22 02:58:54  arthchan2003
- * Added  keyword
- *
- * Revision 1.3  2005/03/30 01:22:48  archan
- * Fixed mistakes in last updates. Add
- *
- * 
- * 18-Jun-97	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon
- * 		Added strcmp_nocase, UPPER_CASE and LOWER_CASE definitions.
- * 
- * 16-Feb-97	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon
- * 		Created.
- */
-
-
-/**
- * @file case.h
- * @brief Locale-independent implementation of case swapping operation. 
- *
- * This function implements ASCII-only case switching and comparison
- * related operations, which do not depend on the locale and are
- * guaranteed to exist on all versions of Windows.
- */
-
-#ifndef _LIBUTIL_CASE_H_
-#define _LIBUTIL_CASE_H_
-
-#include <string.h>
-
-#include <sphinxbase/prim_type.h>
-#include <sphinxbase/sphinxbase_export.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-  /** 
-   * Return upper case form for c 
-   */
-#define UPPER_CASE(c)	((((c) >= 'a') && ((c) <= 'z')) ? (c-32) : c)
-
-  /**
-   * Return lower case form for c 
-   */
-#define LOWER_CASE(c)	((((c) >= 'A') && ((c) <= 'Z')) ? (c+32) : c)
-
-
-  /** 
-   * Convert str to all upper case.
-   * @param str is a string.
-   */
-SPHINXBASE_EXPORT
-void ucase(char *str);
-
-  /** 
-   * Convert str to all lower case
-   * @param str is a string.
-   */
-SPHINXBASE_EXPORT
-void lcase(char *str);
-
-  /**
-   * (FIXME! The implementation is incorrect!) 
-   * Case insensitive string compare.  Return the usual -1, 0, +1, depending on
-   * str1 <, =, > str2 (case insensitive, of course).
-   * @param str1 is the first string.
-   * @param str2 is the second string. 
-   */
-SPHINXBASE_EXPORT
-int32 strcmp_nocase(const char *str1, const char *str2);
-
-/**
- * Like strcmp_nocase() but with a maximum length.
- */
-SPHINXBASE_EXPORT
-int32 strncmp_nocase(const char *str1, const char *str2, size_t len);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/ckd_alloc.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced
- * Research Projects Agency and the National Science Foundation of the
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/*
- * ckd_alloc.h -- Memory allocation package.
- *
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1999 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- *
- * HISTORY
- * $Log: ckd_alloc.h,v $
- * Revision 1.10  2005/06/22 02:59:25  arthchan2003
- * Added  keyword
- *
- * Revision 1.3  2005/03/30 01:22:48  archan
- * Fixed mistakes in last updates. Add
- *
- *
- * 19-Jun-97	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Removed file,line arguments from free functions.
- *
- * 01-Jan-96	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Created.
- */
-
-
-/*********************************************************************
- *
- * $Header: /cvsroot/cmusphinx/sphinx3/src/libutil/ckd_alloc.h,v 1.10 2005/06/22 02:59:25 arthchan2003 Exp $
- *
- * Carnegie Mellon ARPA Speech Group
- *
- * Copyright (c) 1994 Carnegie Mellon University.
- * All rights reserved.
- *
- *********************************************************************
- *
- * file: ckd_alloc.h
- *
- * traceability:
- *
- * description:
- *
- * author:
- *
- *********************************************************************/
-
-
-#ifndef _LIBUTIL_CKD_ALLOC_H_
-#define _LIBUTIL_CKD_ALLOC_H_
-
-#include <stdlib.h>
-#include <setjmp.h>
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-#include <sphinxbase/prim_type.h>
-
-/** \file ckd_alloc.h
- *\brief Sphinx's memory allocation/deallocation routines.
- *
- *Implementation of efficient memory allocation deallocation for
- *multiple dimensional arrays.
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-/**
- * Control behaviour of the program when allocation fails.
- *
- * Although your program is probably toast when memory allocation
- * fails, it is also probably a good idea to be able to catch these
- * errors and alert the user in some way.  Either that, or you might
- * want the program to call abort() so that you can debug the failed
- * code.  This function allows you to control that behaviour.
- *
- * @param env Pointer to a <code>jmp_buf</code> initialized with
- * setjmp(), or NULL to remove a previously set jump target.
- * @param abort If non-zero, the program will call abort() when
- * allocation fails rather than exiting or calling longjmp().
- * @return Pointer to a previously set <code>jmp_buf</code>, if any.
- */
-jmp_buf *ckd_set_jump(jmp_buf *env, int abort);
-
-/**
- * Fail (with a message) according to behaviour specified by ckd_set_jump().
- */
-void ckd_fail(char *format, ...);
-
-/*
- * The following functions are similar to the malloc family, except
- * that they have two additional parameters, caller_file and
- * caller_line, for error reporting.  All functions print a diagnostic
- * message if any error occurs, with any other behaviour determined by
- * ckd_set_jump(), above.
- */
-
-SPHINXBASE_EXPORT
-void *__ckd_calloc__(size_t n_elem, size_t elem_size,
-		     const char *caller_file, int caller_line);
-
-SPHINXBASE_EXPORT
-void *__ckd_malloc__(size_t size,
-		     const char *caller_file, int caller_line);
-
-SPHINXBASE_EXPORT
-void *__ckd_realloc__(void *ptr, size_t new_size,
-		      const char *caller_file, int caller_line);
-
-/**
- * Like strdup, except that if an error occurs it prints a diagnostic message and
- * exits. If origin in NULL the function also returns NULL.
- */
-SPHINXBASE_EXPORT
-char *__ckd_salloc__(const char *origstr,
-		     const char *caller_file, int caller_line);
-
-/**
- * Allocate a 2-D array and return ptr to it (ie, ptr to vector of ptrs).
- * The data area is allocated in one block so it can also be treated as a 1-D array.
- */
-SPHINXBASE_EXPORT
-void *__ckd_calloc_2d__(size_t d1, size_t d2,	/* In: #elements in the 2 dimensions */
-                        size_t elemsize,	/* In: Size (#bytes) of each element */
-                        const char *caller_file, int caller_line);	/* In */
-
-/**
- * Allocate a 3-D array and return ptr to it.
- * The data area is allocated in one block so it can also be treated as a 1-D array.
- */
-SPHINXBASE_EXPORT
-void *__ckd_calloc_3d__(size_t d1, size_t d2, size_t d3,	/* In: #elems in the dims */
-                        size_t elemsize,		/* In: Size (#bytes) per element */
-                        const char *caller_file, int caller_line);	/* In */
-
-/**
- * Allocate a 34D array and return ptr to it.
- * The data area is allocated in one block so it can also be treated as a 1-D array.
- */
-SPHINXBASE_EXPORT
-void ****__ckd_calloc_4d__(size_t d1,
-			   size_t d2,
-			   size_t d3,
-			   size_t d4,
-			   size_t elem_size,
-			   char *caller_file,
-			   int caller_line);
-
-/**
- * Overlay a 3-D array over a previously allocated storage area.
- **/
-SPHINXBASE_EXPORT
-void * __ckd_alloc_3d_ptr(size_t d1,
-                          size_t d2,
-                          size_t d3,
-                          void *store,
-                          size_t elem_size,
-                          char *caller_file,
-                          int caller_line);
-
-/**
- * Overlay a s-D array over a previously allocated storage area.
- **/
-SPHINXBASE_EXPORT
-void *__ckd_alloc_2d_ptr(size_t d1,
-                         size_t d2,
-                         void *store,
-                         size_t elem_size,
-                         char *caller_file,
-                         int caller_line);
-
-/**
- * Test and free a 1-D array
- */
-SPHINXBASE_EXPORT
-void ckd_free(void *ptr);
-
-/**
- * Free a 2-D array (ptr) previously allocated by ckd_calloc_2d
- */
-SPHINXBASE_EXPORT
-void ckd_free_2d(void *ptr);
-
-/**
- * Free a 3-D array (ptr) previously allocated by ckd_calloc_3d
- */
-SPHINXBASE_EXPORT
-void ckd_free_3d(void *ptr);
-
-/**
- * Free a 4-D array (ptr) previously allocated by ckd_calloc_4d
- */
-SPHINXBASE_EXPORT
-void ckd_free_4d(void *ptr);
-
-/**
- * Macros to simplify the use of above functions.
- * One should use these, rather than target functions directly.
- */
-
-/**
- * Macro for __ckd_calloc__
- */
-#define ckd_calloc(n,sz)	__ckd_calloc__((n),(sz),__FILE__,__LINE__)
-
-/**
- * Macro for __ckd_malloc__
- */
-#define ckd_malloc(sz)		__ckd_malloc__((sz),__FILE__,__LINE__)
-
-/**
- * Macro for __ckd_realloc__
- */
-#define ckd_realloc(ptr,sz)	__ckd_realloc__(ptr,(sz),__FILE__,__LINE__)
-
-/**
- * Macro for __ckd_salloc__
- */
-
-#define ckd_salloc(ptr)		__ckd_salloc__(ptr,__FILE__,__LINE__)
-
-/**
- * Macro for __ckd_calloc_2d__
- */
-
-#define ckd_calloc_2d(d1,d2,sz)	__ckd_calloc_2d__((d1),(d2),(sz),__FILE__,__LINE__)
-
-/**
- * Macro for __ckd_calloc_3d__
- */
-
-#define ckd_calloc_3d(d1,d2,d3,sz) __ckd_calloc_3d__((d1),(d2),(d3),(sz),__FILE__,__LINE__)
-
-/**
- * Macro for __ckd_calloc_4d__
- */
-#define ckd_calloc_4d(d1, d2, d3, d4, s)  __ckd_calloc_4d__((d1), (d2), (d3), (d4), (s), __FILE__, __LINE__)
-
-/**
- * Macro for __ckd_alloc_2d_ptr__
- */
-
-#define ckd_alloc_2d_ptr(d1, d2, bf, sz)    __ckd_alloc_2d_ptr((d1), (d2), (bf), (sz), __FILE__, __LINE__)
-
-/**
- * Free only the pointer arrays allocated with ckd_alloc_2d_ptr().
- */
-#define ckd_free_2d_ptr(bf) ckd_free(bf)
-
-/**
- * Macro for __ckd_alloc_3d_ptr__
- */
-
-#define ckd_alloc_3d_ptr(d1, d2, d3, bf, sz) __ckd_alloc_3d_ptr((d1), (d2), (d3), (bf), (sz), __FILE__, __LINE__)
-
-/**
- * Free only the pointer arrays allocated with ckd_alloc_3d_ptr().
- */
-#define ckd_free_3d_ptr(bf) ckd_free_2d(bf)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/clapack_lite.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef __CLAPACK_LITE_H
-#define __CLAPACK_LITE_H
-
-#include "f2c.h"
- 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-/* Subroutine */ int sgemm_(char *transa, char *transb, integer *m, integer *
-                            n, integer *k, real *alpha, real *a, integer *lda, real *b, integer *
-                            ldb, real *beta, real *c__, integer *ldc);
-/* Subroutine */ int sgemv_(char *trans, integer *m, integer *n, real *alpha,
-                            real *a, integer *lda, real *x, integer *incx, real *beta, real *y,
-                            integer *incy);
-/* Subroutine */ int ssymm_(char *side, char *uplo, integer *m, integer *n,
-                            real *alpha, real *a, integer *lda, real *b, integer *ldb, real *beta,
-                            real *c__, integer *ldc);
-
-/* Subroutine */ int sposv_(char *uplo, integer *n, integer *nrhs, real *a,
-                            integer *lda, real *b, integer *ldb, integer *info);
-/* Subroutine */ int spotrf_(char *uplo, integer *n, real *a, integer *lda,
-                             integer *info);
-
-#ifdef __cplusplus
-}
-#endif
-
- 
-#endif /* __CLAPACK_LITE_H */

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/cmd_ln.h
+++ /dev/null
@@ -1,587 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/*
- * cmd_ln.h -- Command line argument parsing.
- *
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1999 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * 
- * 15-Jul-1997	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Added required arguments types.
- * 
- * 07-Dec-96	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Created, based on Eric's implementation.  Basically, combined several
- *		functions into one, eliminated validation, and simplified the interface.
- */
-
-
-#ifndef _LIBUTIL_CMD_LN_H_
-#define _LIBUTIL_CMD_LN_H_
-
-#include <stdio.h>
-#include <stdarg.h>
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-#include <sphinxbase/prim_type.h>
-
-/**
- * @file cmd_ln.h
- * @brief Command-line and other configurationparsing and handling.
- *  
- * Configuration parameters, optionally parsed from the command line.
- */
-  
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-/**
- * @struct arg_t
- * Argument definition structure.
- */
-typedef struct arg_s {
-	char const *name;   /**< Name of the command line switch */
-	int type;           /**< Type of the argument in question */
-	char const *deflt;  /**< Default value (as a character string), or NULL if none */
-	char const *doc;    /**< Documentation/description string */
-} arg_t;
-
-/**
- * @name Values for arg_t::type
- */
-/* @{ */
-/**
- * Bit indicating a required argument.
- */
-#define ARG_REQUIRED (1<<0)
-/**
- * Integer argument (optional).
- */
-#define ARG_INTEGER  (1<<1)
-/**
- * Floating point argument (optional).
- */
-#define ARG_FLOATING (1<<2)
-/**
- * String argument (optional).
- */
-#define ARG_STRING   (1<<3)
-/**
- * Boolean (true/false) argument (optional).
- */
-#define ARG_BOOLEAN  (1<<4)
-/**
- * Boolean (true/false) argument (optional).
- */
-#define ARG_STRING_LIST  (1<<5)
-
-/**
- * Required integer argument.
- */
-#define REQARG_INTEGER (ARG_INTEGER | ARG_REQUIRED)
-/**
- * Required floating point argument.
- */
-#define REQARG_FLOATING (ARG_FLOATING | ARG_REQUIRED)
-/**
- * Required string argument.
- */
-#define REQARG_STRING (ARG_STRING | ARG_REQUIRED)
-/**
- * Required boolean argument.
- */
-#define REQARG_BOOLEAN (ARG_BOOLEAN | ARG_REQUIRED)
-
-/**
- * @deprecated Use ARG_INTEGER instead.
- */
-#define ARG_INT32   ARG_INTEGER
-/**
- * @deprecated Use ARG_FLOATING instead.
- */
-#define ARG_FLOAT32 ARG_FLOATING
-/**
- * @deprecated Use ARG_FLOATING instead.
- */
-#define ARG_FLOAT64 ARG_FLOATING
-/**
- * @deprecated Use REQARG_INTEGER instead.
- */
-#define REQARG_INT32 (ARG_INT32 | ARG_REQUIRED)
-/**
- * @deprecated Use REQARG_FLOATING instead.
- */
-#define REQARG_FLOAT32 (ARG_FLOAT32 | ARG_REQUIRED)
-/**
- * @deprecated Use REQARG_FLOATING instead.
- */
-#define REQARG_FLOAT64 (ARG_FLOAT64 | ARG_REQUIRED)
-/* @} */
-
-
-/**
- * Helper macro to stringify enums and other non-string values for
- * default arguments.
- **/
-#define ARG_STRINGIFY(s) ARG_STRINGIFY1(s)
-#define ARG_STRINGIFY1(s) #s
-
-/**
- * @struct cmd_ln_t
- * Opaque structure used to hold the results of command-line parsing.
- */
-typedef struct cmd_ln_s cmd_ln_t;
-
-/**
- * Create a cmd_ln_t from NULL-terminated list of arguments.
- *
- * This function creates a cmd_ln_t from a NULL-terminated list of
- * argument strings.  For example, to create the equivalent of passing
- * "-hmm foodir -dsratio 2 -lm bar.lm" on the command-line:
- *
- *  config = cmd_ln_init(NULL, defs, TRUE, "-hmm", "foodir", "-dsratio", "2",
- *                       "-lm", "bar.lm", NULL);
- *
- * Note that for simplicity, <strong>all</strong> arguments are passed
- * as strings, regardless of the actual underlying type.
- *
- * @param inout_cmdln Previous command-line to update, or NULL to create a new one.
- * @param defn Array of argument name definitions, or NULL to allow any arguments.
- * @param strict Whether to fail on duplicate or unknown arguments.
- * @return A cmd_ln_t* containing the results of command line parsing, or NULL on failure.
- */
-SPHINXBASE_EXPORT
-cmd_ln_t *cmd_ln_init(cmd_ln_t *inout_cmdln, arg_t const *defn, int32 strict, ...);
-
-/**
- * Retain ownership of a command-line argument set.
- *
- * @return pointer to retained command-line argument set.
- */
-SPHINXBASE_EXPORT
-cmd_ln_t *cmd_ln_retain(cmd_ln_t *cmdln);
-
-/**
- * Release a command-line argument set and all associated strings.
- *
- * @return new reference count (0 if freed completely)
- */
-SPHINXBASE_EXPORT
-int cmd_ln_free_r(cmd_ln_t *cmdln);
-
-/**
- * Parse a list of strings into argumetns.
- *
- * Parse the given list of arguments (name-value pairs) according to
- * the given definitions.  Argument values can be retrieved in future
- * using cmd_ln_access().  argv[0] is assumed to be the program name
- * and skipped.  Any unknown argument name causes a fatal error.  The
- * routine also prints the prevailing argument values (to stderr)
- * after parsing.
- *
- * @note It is currently assumed that the strings in argv are
- *       allocated statically, or at least that they will be valid as
- *       long as the cmd_ln_t returned from this function.
- *       Unpredictable behaviour will result if they are freed or
- *       otherwise become invalidated.
- *
- * @return A cmd_ln_t containing the results of command line parsing,
- *         or NULL on failure.
- **/
-SPHINXBASE_EXPORT
-cmd_ln_t *cmd_ln_parse_r(cmd_ln_t *inout_cmdln, /**< In/Out: Previous command-line to update,
-                                                     or NULL to create a new one. */
-                         arg_t const *defn,	/**< In: Array of argument name definitions */
-                         int32 argc,		/**< In: Number of actual arguments */
-                         char *argv[],		/**< In: Actual arguments */
-                         int32 strict           /**< In: Fail on duplicate or unknown
-                                                   arguments, or no arguments? */
-    );
-
-/**
- * Parse an arguments file by deliminating on " \r\t\n" and putting each tokens
- * into an argv[] for cmd_ln_parse().
- *
- * @return A cmd_ln_t containing the results of command line parsing, or NULL on failure.
- */
-SPHINXBASE_EXPORT
-cmd_ln_t *cmd_ln_parse_file_r(cmd_ln_t *inout_cmdln, /**< In/Out: Previous command-line to update,
-                                                     or NULL to create a new one. */
-                              arg_t const *defn,   /**< In: Array of argument name definitions*/
-                              char const *filename,/**< In: A file that contains all
-                                                     the arguments */ 
-                              int32 strict         /**< In: Fail on duplicate or unknown
-                                                     arguments, or no arguments? */
-    );
-
-/**
- * Access the generic type union for a command line argument.
- */
-SPHINXBASE_EXPORT
-anytype_t *cmd_ln_access_r(cmd_ln_t *cmdln, char const *name);
-
-/**
- * Retrieve a string from a command-line object.
- *
- * The command-line object retains ownership of this string, so you
- * should not attempt to free it manually.
- *
- * @param cmdln Command-line object.
- * @param name the command-line flag to retrieve.
- * @return the string value associated with <tt>name</tt>, or NULL if
- *         <tt>name</tt> does not exist.  You must use
- *         cmd_ln_exists_r() to distinguish between cases where a
- *         value is legitimately NULL and where the corresponding flag
- *         is unknown.
- */
-SPHINXBASE_EXPORT
-char const *cmd_ln_str_r(cmd_ln_t *cmdln, char const *name);
-
-/**
- * Retrieve an array of strings from a command-line object.
- *
- * The command-line object retains ownership of this array, so you
- * should not attempt to free it manually.
- *
- * @param cmdln Command-line object.
- * @param name the command-line flag to retrieve.
- * @return the array of strings associated with <tt>name</tt>, or NULL if
- *         <tt>name</tt> does not exist.  You must use
- *         cmd_ln_exists_r() to distinguish between cases where a
- *         value is legitimately NULL and where the corresponding flag
- *         is unknown.
- */
-SPHINXBASE_EXPORT
-char const **cmd_ln_str_list_r(cmd_ln_t *cmdln, char const *name);
-
-/**
- * Retrieve an integer from a command-line object.
- *
- * @param cmdln Command-line object.
- * @param name the command-line flag to retrieve.
- * @return the integer value associated with <tt>name</tt>, or 0 if
- *         <tt>name</tt> does not exist.  You must use
- *         cmd_ln_exists_r() to distinguish between cases where a
- *         value is legitimately zero and where the corresponding flag
- *         is unknown.
- */
-SPHINXBASE_EXPORT
-long cmd_ln_int_r(cmd_ln_t *cmdln, char const *name);
-
-/**
- * Retrieve a floating-point number from a command-line object.
- *
- * @param cmdln Command-line object.
- * @param name the command-line flag to retrieve.
- * @return the float value associated with <tt>name</tt>, or 0.0 if
- *         <tt>name</tt> does not exist.  You must use
- *         cmd_ln_exists_r() to distinguish between cases where a
- *         value is legitimately zero and where the corresponding flag
- *         is unknown.
- */
-SPHINXBASE_EXPORT
-double cmd_ln_float_r(cmd_ln_t *cmdln, char const *name);
-
-/**
- * Retrieve a boolean value from a command-line object.
- */
-#define cmd_ln_boolean_r(c,n) (cmd_ln_int_r(c,n) != 0)
-
-/**
- * Set a string in a command-line object.
- *
- * @param cmdln Command-line object.
- * @param name The command-line flag to set.
- * @param str String value to set.  The command-line object does not
- *            retain ownership of this pointer.
- */
-SPHINXBASE_EXPORT
-void cmd_ln_set_str_r(cmd_ln_t *cmdln, char const *name, char const *str);
-
-/**
- * Set an integer in a command-line object.
- *
- * @param cmdln Command-line object.
- * @param name The command-line flag to set.
- * @param iv Integer value to set.
- */
-SPHINXBASE_EXPORT
-void cmd_ln_set_int_r(cmd_ln_t *cmdln, char const *name, long iv);
-
-/**
- * Set a floating-point number in a command-line object.
- *
- * @param cmdln Command-line object.
- * @param name The command-line flag to set.
- * @param fv Integer value to set.
- */
-SPHINXBASE_EXPORT
-void cmd_ln_set_float_r(cmd_ln_t *cmdln, char const *name, double fv);
-
-/**
- * Set a boolean value in a command-line object.
- */
-#define cmd_ln_set_boolean_r(c,n,b) (cmd_ln_set_int_r(c,n,(b)!=0))
-
-/*
- * Compatibility macros
- */
-#define cmd_ln_int32_r(c,n)	(int32)cmd_ln_int_r(c,n)
-#define cmd_ln_float32_r(c,n)	(float32)cmd_ln_float_r(c,n)
-#define cmd_ln_float64_r(c,n)	(float64)cmd_ln_float_r(c,n)
-#define cmd_ln_set_int32_r(c,n,i)   cmd_ln_set_int_r(c,n,i)
-#define cmd_ln_set_float32_r(c,n,f) cmd_ln_set_float_r(c,n,(double)f)
-#define cmd_ln_set_float64_r(c,n,f) cmd_ln_set_float_r(c,n,(double)f)
-
-/**
- * Re-entrant version of cmd_ln_exists().
- *
- * @return True if the command line argument exists (i.e. it
- * was one of the arguments defined in the call to cmd_ln_parse_r().
- */
-SPHINXBASE_EXPORT
-int cmd_ln_exists_r(cmd_ln_t *cmdln, char const *name);
-
-/**
- * Print a help message listing the valid argument names, and the associated
- * attributes as given in defn.
- *
- * @param fp   output stream
- * @param defn Array of argument name definitions.
- */
-SPHINXBASE_EXPORT
-void cmd_ln_print_help_r (cmd_ln_t *cmdln, FILE *fp, const arg_t *defn);
-
-/**
- * Non-reentrant version of cmd_ln_parse().
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_parse_r().
- * @return 0 if successful, <0 if error.
- */
-SPHINXBASE_EXPORT
-int32 cmd_ln_parse(const arg_t *defn,  /**< In: Array of argument name definitions */
-                   int32 argc,	       /**< In: Number of actual arguments */
-                   char *argv[],       /**< In: Actual arguments */
-                   int32 strict        /**< In: Fail on duplicate or unknown
-                                          arguments, or no arguments? */
-	);
-
-/**
- * Parse an arguments file by deliminating on " \r\t\n" and putting each tokens
- * into an argv[] for cmd_ln_parse().
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_parse_file_r().
- *
- * @return 0 if successful, <0 on error.
- */
-SPHINXBASE_EXPORT
-int32 cmd_ln_parse_file(const arg_t *defn,   /**< In: Array of argument name definitions*/
-			char const *filename,/**< In: A file that contains all the arguments */ 
-                        int32 strict         /**< In: Fail on duplicate or unknown
-                                                arguments, or no arguments? */
-	);
-
-/**
- * Old application initialization routine for Sphinx3 code.
- *
- * @deprecated This is deprecated in favor of the re-entrant API.
- */
-SPHINXBASE_EXPORT
-void cmd_ln_appl_enter(int argc,   /**< In: Number of actual arguments */
-		       char *argv[], /**< In: Number of actual arguments */
-		       char const* default_argfn, /**< In: default argument file name*/
-		       const arg_t *defn /**< Command-line argument definition */
-	);
-
-
-/**
- * Finalization routine corresponding to cmd_ln_appl_enter().
- *
- * @deprecated This is deprecated in favor of the re-entrant API.
- */
-
-SPHINXBASE_EXPORT
-void cmd_ln_appl_exit(void);
-
-/**
- * Retrieve the global cmd_ln_t object used by non-re-entrant functions.
- *
- * @deprecated This is deprecated in favor of the re-entrant API.
- * @return global cmd_ln_t object.
- */
-SPHINXBASE_EXPORT
-cmd_ln_t *cmd_ln_get(void);
-
-/**
- * Test the existence of a command-line argument in the global set of
- * definitions.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_exists_r().
- *
- * @return True if the command line argument exists (i.e. it
- * was one of the arguments defined in the call to cmd_ln_parse().
- */
-#define cmd_ln_exists(name)	cmd_ln_exists_r(cmd_ln_get(), name)
-
-/**
- * Return a pointer to the previously parsed value for the given argument name.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_access_r().
- */
-#define cmd_ln_access(name)	cmd_ln_access_r(cmd_ln_get(), name)
-
-/**
- * Retrieve a string from the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_str_r().
- */
-#define cmd_ln_str(name)	cmd_ln_str_r(cmd_ln_get(), name)
-
-/**
- * Retrieve an array of strings in the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_str_list_r().
- */
-#define cmd_ln_str_list(name)	cmd_ln_str_list_r(cmd_ln_get(), name)
-
-/**
- * Retrieve a 32-bit integer from the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_int_r().
- */
-#define cmd_ln_int32(name)	(int32)cmd_ln_int_r(cmd_ln_get(), name)
-/**
- * Retrieve a 32-bit float from the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_float_r().
- */
-#define cmd_ln_float32(name)	(float32)cmd_ln_float_r(cmd_ln_get(), name)
-/**
- * Retrieve a 64-bit float from the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_float_r().
- */
-#define cmd_ln_float64(name)	(float64)cmd_ln_float_r(cmd_ln_get(), name)
-/**
- * Retrieve a boolean from the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_boolean_r().
- */
-#define cmd_ln_boolean(name)	cmd_ln_boolean_r(cmd_ln_get(), name)
-
-/**
- * Set a string in the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_set_str_r().
- */
-#define cmd_ln_set_str(n,s)     cmd_ln_set_str_r(cmd_ln_get(),n,s)
-/**
- * Set a 32-bit integer value in the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_set_int_r().
- */
-#define cmd_ln_set_int32(n,i)   cmd_ln_set_int_r(cmd_ln_get(),n,i)
-/**
- * Set a 32-bit float in the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_set_float_r().
- */
-#define cmd_ln_set_float32(n,f) cmd_ln_set_float_r(cmd_ln_get(),n,f)
-/**
- * Set a 64-bit float in the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_set_float_r().
- */
-#define cmd_ln_set_float64(n,f) cmd_ln_set_float_r(cmd_ln_get(),n,f)
-/**
- * Set a boolean value in the global command line.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_set_boolean_r().
- */
-#define cmd_ln_set_boolean(n,b) cmd_ln_set_boolean_r(cmd_ln_get(),n,b)
-
-/**
- * Print a help message listing the valid argument names, and the associated
- * attributes as given in defn.
- *
- * @deprecated This is deprecated in favor of the re-entrant API
- * function cmd_ln_print_help_r().
- */
-#define cmd_ln_print_help(f,d) cmd_ln_print_help_r(cmd_ln_get(),f,d)
-
-/**
- * Free the global command line, if any exists.
- * @deprecated Use the re-entrant API instead.
- */
-SPHINXBASE_EXPORT
-void cmd_ln_free (void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/cmn.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-/*
- * cmn.h -- Various forms of cepstral mean normalization
- *
- * **********************************************
- * CMU ARPA Speech Project
- *
- * Copyright (c) 1999 Carnegie Mellon University.
- * ALL RIGHTS RESERVED.
- * **********************************************
- * 
- * HISTORY
- * $Log$
- * Revision 1.1  2006/04/05  20:27:30  dhdfu
- * A Great Reorganzation of header files and executables
- * 
- * Revision 1.13  2006/02/23 03:48:27  arthchan2003
- * Resolved conflict in cmn.h
- *
- *
- * Revision 1.12  2006/02/22 23:43:55  arthchan2003
- * Merged from the branch SPHINX3_5_2_RCI_IRII_BRANCH: Put data structure into the cmn_t structure.
- *
- * Revision 1.11.4.2  2005/10/17 04:45:57  arthchan2003
- * Free stuffs in cmn and feat corectly.
- *
- * Revision 1.11.4.1  2005/07/05 06:25:08  arthchan2003
- * Fixed dox-doc.
- *
- * Revision 1.11  2005/06/21 19:28:00  arthchan2003
- * 1, Fixed doxygen documentation. 2, Added $ keyword.
- *
- * Revision 1.4  2005/06/13 04:02:56  archan
- * Fixed most doxygen-style documentation under libs3decoder.
- *
- * Revision 1.3  2005/03/30 01:22:46  archan
- * Fixed mistakes in last updates. Add
- *
- * 
- * 20.Apr.2001  RAH (rhoughton@mediasite.com, ricky.houghton@cs.cmu.edu)
- *              Added cmn_free() and moved *mean and *var out global space and named them cmn_mean and cmn_var
- * 
- * 28-Apr-1999	M K Ravishankar (rkm@cs.cmu.edu) at Carnegie Mellon University
- * 		Copied from previous version.
- */
-
-
-#ifndef _S3_CMN_H_
-#define _S3_CMN_H_
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-#include <sphinxbase/prim_type.h>
-#include <sphinxbase/fe.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-/** \file cmn.h
- * \brief Apply Cepstral Mean Normalization (CMN) to the set of input mfc frames.
- *
- * By subtractingthe mean of the input from each frame.  C0 is also included in this process.
- * This function operates on an entire utterance at a time.  Hence, the entire utterance
- * must be available beforehand (batchmode).
- */
-
-/**
- * Types of cepstral mean normalization to apply to the features.
- */
-typedef enum cmn_type_e {
-    CMN_NONE = 0,
-    CMN_CURRENT,
-    CMN_PRIOR
-} cmn_type_t;
-
-/** String representations of cmn_type_t values. */
-SPHINXBASE_EXPORT
-extern const char *cmn_type_str[];
-
-/** Convert string representation (from command-line) to cmn_type_t */
-SPHINXBASE_EXPORT
-cmn_type_t cmn_type_from_str(const char *str);
-
-/** \struct cmn_t
- *  \brief wrapper of operation of the cepstral mean normalization. 
- */
-
-typedef struct {
-    mfcc_t *cmn_mean;   /**< Temporary variable: current means */
-    mfcc_t *cmn_var;    /**< Temporary variables: stored the cmn variance */
-    mfcc_t *sum;        /**< The sum of the cmn frames */
-    int32 nframe;	/**< Number of frames */
-    int32 veclen;	/**< Length of cepstral vector */
-} cmn_t;
-
-SPHINXBASE_EXPORT
-cmn_t* cmn_init(int32 veclen);
-
-/**
- * CMN for the whole sentence
-*/
-SPHINXBASE_EXPORT
-void cmn (cmn_t *cmn,   /**< In/Out: cmn normalization, which contains the cmn_mean and cmn_var) */
-          mfcc_t **mfc,	/**< In/Out: mfc[f] = mfc vector in frame f */
-	  int32 varnorm,/**< In: if not FALSE, variance normalize the input vectors
-			   to have unit variance (along each dimension independently);
-			   Irrelevant if no cmn is performed */
-	  int32 n_frame /**< In: Number of frames of mfc vectors */
-	);
-
-#define CMN_WIN_HWM     800     /* #frames after which window shifted */
-#define CMN_WIN         500
-
-/**
- * CMN for one block of data, using prior mean
- */
-SPHINXBASE_EXPORT
-void cmn_prior(cmn_t *cmn,        /**< In/Out: cmn normalization, which contains
-                                    the cmn_mean and cmn_var) */
-               mfcc_t **incep,  /**< In/Out: mfc[f] = mfc vector in frame f*/
-	       int32 varnorm,    /**< This flag should always be 0 for live */
-	       int32 nfr         /**< Number of incoming frames */
-    );
-
-/**
- * Update prior mean based on observed data
- */
-SPHINXBASE_EXPORT
-void cmn_prior_update(cmn_t *cmn);
-
-/**
- * Set the prior mean.
- */
-SPHINXBASE_EXPORT
-void cmn_prior_set(cmn_t *cmn, mfcc_t const *vec);
-
-/**
- * Get the prior mean.
- */
-SPHINXBASE_EXPORT
-void cmn_prior_get(cmn_t *cmn, mfcc_t *vec);
-
-/* RAH, free previously allocated memory */
-SPHINXBASE_EXPORT
-void cmn_free (cmn_t *cmn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/err.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1999-2004 Carnegie Mellon University.  All rights
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced
- * Research Projects Agency and the National Science Foundation of the
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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 _LIBUTIL_ERR_H_
-#define _LIBUTIL_ERR_H_
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-
-/**
- * @file err.h
- * @brief Implementation of logging routines.
- *
- * Logging, warning, debug and error message output funtionality is provided in this file.
- * Sphinxbase defines several level of logging messages - INFO, WARNING, ERROR, FATAL. By
- * default output goes to standard error output.
- *
- * Logging is implemented through macros. They take same arguments as printf: format string and
- * values. By default source file name and source line are prepended to the message. Log output
- * could be redirected to any file using err_set_logfp() and err_set_logfile() functions. To disable
- * logging in your application, call err_set_logfp(NULL).
- *
- * It's possible to log multiline info messages, to do that you need to start message with
- * E_INFO and output other lines with E_INFOCONT.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-#define E_SYSCALL(stmt, ...)  if (stmt) E_FATAL_SYSTEM(__VA_ARGS__);
-
-#define FILELINE  __FILE__ , __LINE__
-
-/**
- * Exit with non-zero status after error message
- */
-#define E_FATAL(...)                               \
-    do {                                           \
-        err_msg(ERR_FATAL, FILELINE, __VA_ARGS__); \
-        exit(EXIT_FAILURE);                        \
-    } while (0)
-
-/**
- * Print error text; Call perror(""); exit(errno);
- */
-#define E_FATAL_SYSTEM(...)                                                  \
-    do {                                                                     \
-        err_msg_system(ERR_FATAL, FILELINE, __VA_ARGS__);		     \
-        exit(EXIT_FAILURE);                                                  \
-    } while (0)
-
-/**
- * Print error text; Call perror("");
- */
-#define E_ERROR_SYSTEM(...)     err_msg_system(ERR_ERROR, FILELINE, __VA_ARGS__)
-
-/**
- * Print error message to error log
- */
-#define E_ERROR(...)     err_msg(ERR_ERROR, FILELINE, __VA_ARGS__)
-
-/**
- * Print warning message to error log
- */
-#define E_WARN(...)      err_msg(ERR_WARN, FILELINE, __VA_ARGS__)
-
-/**
- * Print logging information to standard error stream
- */
-#define E_INFO(...)      err_msg(ERR_INFO, FILELINE, __VA_ARGS__)
-
-/**
- * Continue printing the information to standard error stream
- */
-#define E_INFOCONT(...)  err_msg(ERR_INFOCONT, NULL, 0, __VA_ARGS__)
-
-/**
- * Print logging information without filename.
- */
-#define E_INFO_NOFN(...)  err_msg(ERR_INFO, NULL, 0, __VA_ARGS__)
-
-/**
- * Print debugging information to standard error stream.
- *
- * This will only print a message if:
- *  1. Debugging is enabled at compile time
- *  2. The debug level is greater than or equal to \a level
- *
- * Note that for portability reasons the format and arguments must be
- * enclosed in an extra set of parentheses.
- */
-#ifdef SPHINX_DEBUG
-#define E_DEBUG(level, ...) \
-    if (err_get_debug_level() >= level) \
-        err_msg(ERR_DEBUG, FILELINE, __VA_ARGS__)
-#define E_DEBUGCONT(level, ...) \
-    if (err_get_debug_level() >= level) \
-        err_msg(ERR_DEBUG, NULL, 0, __VA_ARGS__)
-#else
-#define E_DEBUG(level,x)
-#define E_DEBUGCONT(level,x)
-#endif
-
-typedef enum err_e {
-    ERR_DEBUG,
-    ERR_INFO,
-    ERR_INFOCONT,
-    ERR_WARN,
-    ERR_ERROR,
-    ERR_FATAL,
-    ERR_MAX
-} err_lvl_t;
-
-SPHINXBASE_EXPORT void
-err_msg(err_lvl_t lvl, const char *path, long ln, const char *fmt, ...);
-
-SPHINXBASE_EXPORT void
-err_msg_system(err_lvl_t lvl, const char *path, long ln, const char *fmt, ...);
-
-SPHINXBASE_EXPORT void
-err_logfp_cb(void * user_data, err_lvl_t level, const char *fmt, ...);
-
-typedef void (*err_cb_f)(void* user_data, err_lvl_t, const char *, ...);
-
-/**
- * Sets function to output error messages. Use it to redirect the logging
- * to your application. By default the handler which dumps messages to
- * stderr is set.
- *
- * @param - callback to pass messages too.
- */
-SPHINXBASE_EXPORT void
-err_set_callback(err_cb_f callback, void *user_data);
-
-/**
- * Direct all logging to a given filehandle if default logfp callback is set.
- *
- * @param logfp Filehandle to send log messages to, or NULL to disable logging.
- */
-SPHINXBASE_EXPORT void
-err_set_logfp(FILE *stream);
-
-/**
- * Get the current logging filehandle.
- *
- * @return Current logging filehandle, NULL if logging is disabled. Initially
- * it returns stderr
- */
-SPHINXBASE_EXPORT FILE *
-err_get_logfp(void);
-
-/**
- * Append all log messages to a given file.
- *
- * Previous logging filehandle is closed (unless it was stdout or stderr).
- *
- * @param file File path to send log messages to
- * @return 0 for success, <0 for failure (e.g. if file does not exist)
- */
-SPHINXBASE_EXPORT int
-err_set_logfile(const char *path);
-
-/**
- * Set debugging verbosity level.
- *
- * Note that debugging messages are only enabled when compiled with -DDEBUG.
- *
- * @param level Verbosity level to set, or 0 to disable debug messages.
- */
-SPHINXBASE_EXPORT
-int err_set_debug_level(int level);
-
-/**
- * Get debugging verbosity level.
- *
- * Note that debugging messages are only enabled when compiled with -DDEBUG.
- */
-SPHINXBASE_EXPORT
-int err_get_debug_level(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_ERR_H */

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/f2c.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* f2c.h  --  Standard Fortran to C header file */
-
-/**  barf  [ba:rf]  2.  "He suggested using FORTRAN, and everybody barfed."
-
-	- From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */
-
-#ifndef F2C_INCLUDE
-#define F2C_INCLUDE
-
-typedef int integer;
-typedef char *address;
-typedef short int shortint;
-typedef float real;
-typedef double doublereal;
-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
-typedef int logical;
-typedef short int shortlogical;
-typedef char logical1;
-typedef char integer1;
-
-#define TRUE_ (1)
-#define FALSE_ (0)
-
-/* Extern is for use with -E */
-#ifndef Extern
-#define Extern extern
-#endif
-
-/* I/O stuff */
-
-#ifdef f2c_i2
-/* for -i2 */
-typedef short flag;
-typedef short ftnlen;
-typedef short ftnint;
-#else
-typedef int flag;
-typedef int ftnlen;
-typedef int ftnint;
-#endif
-
-/*external read, write*/
-typedef struct
-{	flag cierr;
-	ftnint ciunit;
-	flag ciend;
-	char *cifmt;
-	ftnint cirec;
-} cilist;
-
-/*internal read, write*/
-typedef struct
-{	flag icierr;
-	char *iciunit;
-	flag iciend;
-	char *icifmt;
-	ftnint icirlen;
-	ftnint icirnum;
-} icilist;
-
-/*open*/
-typedef struct
-{	flag oerr;
-	ftnint ounit;
-	char *ofnm;
-	ftnlen ofnmlen;
-	char *osta;
-	char *oacc;
-	char *ofm;
-	ftnint orl;
-	char *oblnk;
-} olist;
-
-/*close*/
-typedef struct
-{	flag cerr;
-	ftnint cunit;
-	char *csta;
-} cllist;
-
-/*rewind, backspace, endfile*/
-typedef struct
-{	flag aerr;
-	ftnint aunit;
-} alist;
-
-/* inquire */
-typedef struct
-{	flag inerr;
-	ftnint inunit;
-	char *infile;
-	ftnlen infilen;
-	ftnint	*inex;	/*parameters in standard's order*/
-	ftnint	*inopen;
-	ftnint	*innum;
-	ftnint	*innamed;
-	char	*inname;
-	ftnlen	innamlen;
-	char	*inacc;
-	ftnlen	inacclen;
-	char	*inseq;
-	ftnlen	inseqlen;
-	char 	*indir;
-	ftnlen	indirlen;
-	char	*infmt;
-	ftnlen	infmtlen;
-	char	*inform;
-	ftnint	informlen;
-	char	*inunf;
-	ftnlen	inunflen;
-	ftnint	*inrecl;
-	ftnint	*innrec;
-	char	*inblank;
-	ftnlen	inblanklen;
-} inlist;
-
-#define VOID void
-
-union Multitype {	/* for multiple entry points */
-	shortint h;
-	integer i;
-	real r;
-	doublereal d;
-	complex c;
-	doublecomplex z;
-	};
-
-typedef union Multitype Multitype;
-
-typedef long Long;	/* No longer used; formerly in Namelist */
-
-struct Vardesc {	/* for Namelist */
-	char *name;
-	char *addr;
-	ftnlen *dims;
-	int  type;
-	};
-typedef struct Vardesc Vardesc;
-
-struct Namelist {
-	char *name;
-	Vardesc **vars;
-	int nvars;
-	};
-typedef struct Namelist Namelist;
-
-#ifndef abs
-#define abs(x) ((x) >= 0 ? (x) : -(x))
-#endif
-#define dabs(x) (doublereal)abs(x)
-#ifndef min
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a,b) ((a) >= (b) ? (a) : (b))
-#endif
-#define dmin(a,b) (doublereal)min(a,b)
-#define dmax(a,b) (doublereal)max(a,b)
-
-/* procedure parameter types for -A and -C++ */
-
-#define F2C_proc_par_types 1
-#ifdef __cplusplus
-typedef int /* Unknown procedure type */ (*U_fp)(...);
-typedef shortint (*J_fp)(...);
-typedef integer (*I_fp)(...);
-typedef real (*R_fp)(...);
-typedef doublereal (*D_fp)(...), (*E_fp)(...);
-typedef /* Complex */ VOID (*C_fp)(...);
-typedef /* Double Complex */ VOID (*Z_fp)(...);
-typedef logical (*L_fp)(...);
-typedef shortlogical (*K_fp)(...);
-typedef /* Character */ VOID (*H_fp)(...);
-typedef /* Subroutine */ int (*S_fp)(...);
-#else
-typedef int /* Unknown procedure type */ (*U_fp)(void);
-typedef shortint (*J_fp)(void);
-typedef integer (*I_fp)(void);
-typedef real (*R_fp)(void);
-typedef doublereal (*D_fp)(void), (*E_fp)(void);
-typedef /* Complex */ VOID (*C_fp)(void);
-typedef /* Double Complex */ VOID (*Z_fp)(void);
-typedef logical (*L_fp)(void);
-typedef shortlogical (*K_fp)(void);
-typedef /* Character */ VOID (*H_fp)(void);
-typedef /* Subroutine */ int (*S_fp)(void);
-#endif
-/* E_fp is for real functions when -R is not specified */
-typedef VOID C_f;	/* complex function */
-typedef VOID H_f;	/* character function */
-typedef VOID Z_f;	/* double complex function */
-typedef doublereal E_f;	/* real function with -R not specified */
-
-/* undef any lower-case symbols that your C compiler predefines, e.g.: */
-
-#ifndef Skip_f2c_Undefs
-#undef cray
-#undef gcos
-#undef mc68010
-#undef mc68020
-#undef mips
-#undef pdp11
-#undef sgi
-#undef sparc
-#undef sun
-#undef sun2
-#undef sun3
-#undef sun4
-#undef u370
-#undef u3b
-#undef u3b2
-#undef u3b5
-#undef unix
-#undef vax
-#endif
-#endif

deleted file mode 100644
--- a/media/sphinxbase/sphinxbase/fe.h
+++ /dev/null
@@ -1,617 +0,0 @@
-/* -*- c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* ====================================================================
- * Copyright (c) 1996-2004 Carnegie Mellon University.  All rights 
- * reserved.
- *
- * 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.
- *
- * This work was supported in part by funding from the Defense Advanced 
- * Research Projects Agency and the National Science Foundation of the 
- * United States of America, and the CMU Sphinx Speech Consortium.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
- * ANY EXPRESSED 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 CARNEGIE MELLON UNIVERSITY
- * NOR ITS EMPLOYEES 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.
- *
- * ====================================================================
- *
- */
-
-/*
- * fe.h
- * 
- * $Log: fe.h,v $
- * Revision 1.11  2005/02/05 02:15:02  egouvea
- * Removed fe_process(), never used
- *
- * Revision 1.10  2004/12/10 16:48:55  rkm
- * Added continuous density acoustic model handling
- *
- *
- */
-
-#if defined(_WIN32) && !defined(GNUWINCE)
-#define srand48(x) srand(x)
-#define lrand48() rand()
-#endif
-
-#ifndef _NEW_FE_H_
-#define _NEW_FE_H_
-
-/* Win32/WinCE DLL gunk */
-#include <sphinxbase/sphinxbase_export.h>
-
-#include <sphinxbase/cmd_ln.h>
-#include <sphinxbase/fixpoint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if 0
-/* Fool Emacs. */
-}
-#endif
-
-#ifdef WORDS_BIGENDIAN
-#define NATIVE_ENDIAN "big"
-#else
-#define NATIVE_ENDIAN "little"
-#endif
-
-/** Default number of samples per second. */
-#define DEFAULT_SAMPLING_RATE 16000
-/** Default number of frames per second. */
-#define DEFAULT_FRAME_RATE 100
-/** Default spacing between frame starts (equal to
- * DEFAULT_SAMPLING_RATE/DEFAULT_FRAME_RATE) */
-#define DEFAULT_FRAME_SHIFT 160
-/** Default size of each frame (410 samples @ 16000Hz). */
-#define DEFAULT_WINDOW_LENGTH 0.025625 
-/** Default number of FFT points. */
-#define DEFAULT_FFT_SIZE 512
-/** Default number of MFCC coefficients in output. */
-#define DEFAULT_NUM_CEPSTRA 13
-/** Default number of filter bands used to generate MFCCs. */
-#define DEFAULT_NUM_FILTERS 40
-/** Default prespeech state length */
-#define DEFAULT_PRESPCH_STATE_LEN 10
-/** Default postspeech state length */
-#define DEFAULT_POSTSPCH_STATE_LEN 50
-/** Default lower edge of mel filter bank. */
-#define DEFAULT_LOWER_FILT_FREQ 133.33334
-/** Default upper edge of mel filter bank. */
-#define DEFAULT_UPPER_FILT_FREQ 6855.4976
-/** Default pre-emphasis filter coefficient. */
-#define DEFAULT_PRE_EMPHASIS_ALPHA 0.97
-/** Default type of frequency warping to use for VTLN. */
-#define DEFAULT_WARP_TYPE "inverse_linear"
-/** Default random number seed to use for dithering. */
-#define SEED  -1
-
-#define waveform_to_cepstral_command_line_macro() \
-  { "-logspec", \
-    ARG_BOOLEAN, \
-    "no", \
-    "Write out logspectral files instead of cepstra" }, \
-   \
-  { "-smoothspec", \
-    ARG_BOOLEAN, \
-    "no", \
-    "Write out cepstral-smoothed logspectral files" }, \
-   \
-  { "-transform", \
-    ARG_STRING, \
-    "legacy", \
-    "Which type of transform to use to calculate cepstra (legacy, dct, or htk)" }, \
-   \
-  { "-alpha", \
-    ARG_FLOAT32, \
-    ARG_STRINGIFY(DEFAULT_PRE_EMPHASIS_ALPHA), \
-    "Preemphasis parameter" }, \
-   \
-  { "-samprate", \
-    ARG_FLOAT32, \
-    ARG_STRINGIFY(DEFAULT_SAMPLING_RATE), \
-    "Sampling rate" }, \
-   \
-  { "-frate", \
-    ARG_INT32, \
-    ARG_STRINGIFY(DEFAULT_FRAME_RATE), \
-    "Frame rate" }, \
-   \
-  { "-wlen", \
-    ARG_FLOAT32, \
-    ARG_STRINGIFY(DEFAULT_WINDOW_LENGTH), \
-    "Hamming window length" }, \
-   \
-  { "-nfft", \
-    ARG_INT32, \
-    ARG_STRINGIFY(DEFAULT_FFT_SIZE), \
-    "Size of FFT" }, \
-   \
-  { "-nfilt", \
-    ARG_INT32, \
-    ARG_STRINGIFY(DEFAULT_NUM_FILTERS), \
-    "Number of filter banks" }, \
-   \
-  { "-lowerf", \
-    ARG_FLOAT32, \
-    ARG_STRINGIFY(DEFAULT_LOWER_FILT_FREQ), \
-    "Lower edge of filters" }, \
-   \
-  { "-upperf", \
-    ARG_FLOAT32, \
-    ARG_STRINGIFY(DEFAULT_UPPER_FILT_FREQ), \
-    "Upper edge of filters" }, \
-   \
-  { "-unit_area", \
-    ARG_BOOLEAN, \
-    "yes", \
-    "Normalize mel filters to unit area" }, \
-   \
-  { "-round_filters", \
-    ARG_BOOLEAN, \
-    "yes", \
-    "Round mel filter frequencies to DFT points" }, \
-   \
-  { "-ncep", \
-    ARG_INT32, \
-    ARG_STRINGIFY(DEFAULT_NUM_CEPSTRA), \
-    "Number of cep coefficients" }, \
-   \
-  { "-doublebw", \
-    ARG_BOOLEAN, \
-    "no", \
-    "Use double bandwidth filters (same center freq)" }, \
-   \
-  { "-lifter", \
-    ARG_INT32, \
-    "0", \
-    "Length of sin-curve for liftering, or 0 for no liftering." }, \
-   \
-  { "-vad_prespeech", \
-    ARG_INT32, \
-    ARG_STRINGIFY(DEFAULT_PRESPCH_STATE_LEN), \
-    "Num of speech frames to trigger vad from silence to speech." }, \
-   \
-  { "-vad_postspeech", \
-    ARG_INT32, \
-    ARG_STRINGIFY(DEFAULT_POSTSPCH_STATE_LEN), \
-    "Num of silence frames to trigger vad from speech to silence." }, \
-   \
-  { "-vad_threshold", \
-    ARG_FLOAT32, \
-    "2.0", \
-    "Threshold for decision between noise and silence frames. Log-ratio between signal level and noise level." }, \
-   \
-  { "-input_endian", \
-    ARG_STRING, \
-    NATIVE_ENDIAN, \
-    "Endianness of input data, big or little, ignored if NIST or MS Wav" }, \
-   \
-  { "-warp_type", \
-    ARG_STRING, \
-    DEFAULT_WARP_TYPE, \
-    "Warping function type (or shape)" }, \
-   \
-  { "-warp_params", \
-    ARG_STRING, \
-    NULL, \
-    "Parameters defining the warping function" }, \
-   \
-  { "-dither", \
-    ARG_BOOLEAN, \
-    "no", \
-    "Add 1/2-bit noise" }, \
-   \
-  { "-seed", \
-    ARG_INT32, \
-    ARG_STRINGIFY(SEED), \
-    "Seed for random number generator; if less than zero, pick our own" }, \
-   \
-  { "-remove_dc", \
-    ARG_BOOLEAN, \
-    "no", \
-    "Remove DC offset from each frame" }, \
-                                          \
-  { "-remove_noise", \
-    ARG_BOOLEAN, \
-    "yes", \
-    "Remove noise with spectral subtraction in mel-energies" }, \
-                                                                \
-  { "-remove_silence", \
-    ARG_BOOLEAN, \
-    "yes", \
-    "Enables VAD, removes silence frames from processing" }, \
-                                                             \
-  { "-verbose", \
-    ARG_BOOLEAN, \
-    "no", \
-    "Show input filenames" } \
-  
-  
-#ifdef FIXED_POINT
-/** MFCC computation type. */
-typedef fixed32 mfcc_t;
-
-/** Convert a floating-point value to mfcc_t. */
-#define FLOAT2MFCC(x) FLOAT2FIX(x)
-/** Convert a mfcc_t value to floating-point. */
-#define MFCC2FLOAT(x) FIX2FLOAT(x)
-/** Multiply two mfcc_t values. */
-#define MFCCMUL(a,b) FIXMUL(a,b)
-#define MFCCLN(x,in,out) FIXLN_ANY(x,in,out)
-#else /* !FIXED_POINT */
-
-/** MFCC computation type. */
-typedef float32 mfcc_t;
-/** Convert a floating-point value to mfcc_t. */
-#define FLOAT2MFCC(x) (x)
-/** Convert a mfcc_t value to floating-point. */
-#define MFCC2FLOAT(x) (x)
-/** Multiply two mfcc_t values. */
-#define MFCCMUL(a,b) ((a)*(b))
-#define MFCCLN(x,in,out) log(x)
-#endif /* !FIXED_POINT */
-
-/**
- * Structure for the front-end computation.
- */
-typedef struct fe_s fe_t;
-
-/**
- * Error codes returned by stuff.
- */
-enum fe_error_e {
-	FE_SUCCESS = 0,
-	FE_OUTPUT_FILE_SUCCESS  = 0,
-	FE_CONTROL_FILE_ERROR = -1,
-	FE_START_ERROR = -2,
-	FE_UNKNOWN_SINGLE_OR_BATCH = -3,
-	FE_INPUT_FILE_OPEN_ERROR = -4,
-	FE_INPUT_FILE_READ_ERROR = -5,
-	FE_MEM_ALLOC_ERROR = -6,
-	FE_OUTPUT_FILE_WRITE_ERROR = -7,
-	FE_OUTPUT_FILE_OPEN_ERROR = -8,
-	FE_ZERO_ENERGY_ERROR = -9,
-	FE_INVALID_PARAM_ERROR =  -10
-};
-
-/**
- * Initialize a front-end object from global command-line.
- *
- * This is equivalent to calling fe_init_auto_r(cmd_ln_get()).
- *
- * @return Newly created front-end object.
- */
-SPHINXBASE_EXPORT
-fe_t* fe_init_auto(void);
-
-/**
- * Get the default set of arguments for fe_init_auto_r().
- *
- * @return Pointer to an argument structure which can be passed to
- * cmd_ln_init() in friends to create argument structures for
- * fe_init_auto_r().
- */
-SPHINXBASE_EXPORT
-arg_t const *fe_get_args(void);
-
-/**
- * Initialize a front-end object from a command-line parse.
- *
- * @param config Command-line object, as returned by cmd_ln_parse_r()
- *               or cmd_ln_parse_file().  Ownership of this object is
- *               claimed by the fe_t, so you must not attempt to free
- *               it manually.  Use cmd_ln_retain() if you wish to
- *               reuse it.
- * @return Newly created front-end object.
- */
-SPHINXBASE_EXPORT
-fe_t *fe_init_auto_r(cmd_ln_t *config);
-
-/**
- * Retrieve the command-line object used to initialize this front-end.
- *
- * @return command-line object for this front-end.  This pointer is
- *         retained by the fe_t, so you should not attempt to free it
- *         manually.
- */
-SPHINXBASE_EXPORT
-const cmd_ln_t *fe_get_config(fe_t *fe);
-
-/**
- * Start processing of the stream, resets processed frame counter
- */
-SPHINXBASE_EXPORT
-void fe_start_stream(fe_t *fe);
-
-/**
- * Start processing an utterance.
- * @return 0 for success, <0 for error (see enum fe_error_e)
- */
-SPHINXBASE_EXPORT
-int fe_start_utt(fe_t *fe);
-
-/**
- * Get the dimensionality of the output of this front-end object.
- *
- * This is guaranteed to be the number of values in one frame of
- * output from fe_end_utt() and fe_process_frames().  
- * It is usually the number of MFCC
- * coefficients, but it might be the number of log-spectrum bins, if
- * the <tt>-logspec</tt> or <tt>-smoothspec</tt> options to
- * fe_init_auto() were true.
- *
- * @return Dimensionality of front-end output.
- */
-SPHINXBASE_EXPORT
-int fe_get_output_size(fe_t *fe);
-
-/**
- * Get the dimensionality of the input to this front-end object.
- *
- * This function retrieves the number of input samples consumed by one
- * frame of processing.  To obtain one frame of output, you must have
- * at least <code>*out_frame_size</code> samples.  To obtain <i>N</i>
- * frames of output, you must have at least <code>(N-1) *
- * *out_frame_shift + *out_frame_size</code> input samples.
- *
- * @param out_frame_shift Output: Number of samples between each frame start.
- * @param out_frame_size Output: Number of samples in each frame.
- */
-SPHINXBASE_EXPORT
-void fe_get_input_size(fe_t *fe, int *out_frame_shift,
-                       int *out_frame_size);
-
-/**
- * Get vad state for the last processed frame
- *
- * @return 1 if speech, 0 if silence
- */
-SPHINXBASE_EXPORT
-uint8 fe_get_vad_state(fe_t *fe);
-
-/**
- * Finish processing an utterance.
- *
- * This function also collects any remaining samples and calculates a
- * final cepstral vector.  If there are overflow samples remaining, it
- * will pad with zeros to make a complete frame.
- *
- * @param fe Front-end object.
- * @param out_cepvector Buffer to hold a residual cepstral vector, or NULL
- *                      if you wish to ignore it.  Must be large enough
- * @param out_nframes Number of frames of residual cepstra created
- *                    (either 0 or 1).
- * @return 0 for success, <0 for error (see enum fe_error_e)
- */
-SPHINXBASE_EXPORT
-int fe_end_utt(fe_t *fe, mfcc_t *out_cepvector, int32 *out_nframes);
-
-/**
- * Retain ownership of a front end object.
- *
- * @return pointer to the retained front end.
- */
-SPHINXBASE_EXPORT
-fe_t *fe_retain(fe_t *fe);
-
-/**
- * Free the front end. 
- *
- * Releases resources associated with the front-end object.
- *
- * @return new reference count (0 if freed completely)
- */
-SPHINXBASE_EXPORT
-int fe_free(fe_t *fe);
-
-/*
- * Do same as fe_process_frames, but also returns
- * voiced audio. Output audio is valid till next
- * fe_process_frames call.
- *
- * DO NOT MIX fe_process_frames calls
- *
- * @param voiced_spch Output: obtain voiced audio samples here
- *
- * @param voiced_spch_nsamps Output: shows voiced_spch length
- *
- * @param out_frameidx Output: index of the utterance start
- */
-SPHINXBASE_EXPORT
-int fe_process_frames_ext(fe_t *fe,
-                      int16 const **inout_spch,
-                      size_t *inout_nsamps,
-                      mfcc_t **buf_cep,
-                      int32 *inout_nframes,
-                      int16 **voiced_spch,
-                      int32 *voiced_spch_nsamps,
-                      int32 *out_frameidx);
-
-/** 
- * Process a block of samples.
- *
- * This function generates up to <code>*inout_nframes</code> of
- * features, or as many as can be generated from
- * <code>*inout_nsamps</code> samples.
- *
- * On exit, the <code>inout_spch</code>, <code>inout_nsamps</code>,
- * and <code>inout_nframes</code> parameters are updated to point to
- * the remaining sample data, the number of remaining samples, and the
- * number of frames processed, respectively.  This allows you to call
- * this repeatedly to process a large block of audio in small (say,
- * 5-frame) chunks:
- *
- *  int16 *bigbuf, *p;
- *  mfcc_t **cepstra;
- *  int32 nsamps;
- *  int32 nframes = 5;
- *
- *  cepstra = (mfcc_t **)
- *      ckd_calloc_2d(nframes, fe_get_output_size(fe), sizeof(**cepstra));
- *  p = bigbuf;
- *  while (nsamps) {
- *      nframes = 5;
- *      fe_process_frames(fe, &p, &nsamps, cepstra, &nframes);
- *      // Now do something with these frames...
- *      if (nframes)
- *          do_some_stuff(cepstra, nframes);
- *  }
- *
- * @param inout_spch Input: Pointer to pointer to speech samples
- *                   (signed 16-bit linear PCM).
- *                   Output: Pointer to remaining samples.
- * @param inout_nsamps Input: Pointer to maximum number of samples to
- *                     process.
- *                     Output: Number of samples remaining in input buffer.
- * @param buf_cep Two-dimensional buffer (allocated with
- *                ckd_calloc_2d()) which will receive frames of output
- *                data.  If NULL, no actual processing will be done,
- *                and the maximum number of output frames which would
- *                be generated is returned in
- *                <code>*inout_nframes</code>.
- * @param inout_nframes Input: Pointer to maximum number of frames to
- *                      generate.
- *                      Output: Number of frames actually generated.
- * @param out_frameidx Index of the first frame returned in a stream
- *
- * @return 0 for success, <0 for failure (see enum fe_error_e)
- */
-SPHINXBASE_EXPORT
-int fe_process_frames(fe_t *fe,
-                      int16 const **inout_spch,
-                      size_t *inout_nsamps,
-                      mfcc_t **buf_cep,
-                      int32 *inout_nframes,
-                      int32 *out_frameidx);
-
-/** 
- * Process a block of samples, returning as many frames as possible.
- *
- * This function processes all the samples in a block of data and
- * returns a newly allocated block of feature vectors.  This block
- * needs to be freed with fe_free_2d() after use.
- *
- * It is possible for there to be some left-over data which could not
- * fit in a complete frame.  This data can be processed with
- * fe_end_utt().
- *
- * This function is deprecated in favor of fe_process_frames().
- *
- * @return 0 for success, <0 for failure (see enum fe_error_e)
- */
-SPHINXBASE_EXPORT
-int fe_process_utt(fe_t *fe,  /**< A front end object */
-                   int16 const *spch, /**< The speech samples */
-                   size_t nsamps, /**< number of samples*/
-                   mfcc_t ***cep_block, /**< Output pointer to cepstra */
-                   int32 *nframes /**< Number of frames processed */
-	);
-
-/**
- * Free the output pointer returned by fe_process_utt().
- **/
-SPHINXBASE_EXPORT
-void fe_free_2d(void *arr);
-
-/**
- * Convert a block of mfcc_t to float32 (can be done in-place)
- **/
-SPHINXBASE_EXPORT
-int fe_mfcc_to_float(fe_t *fe,
-                     mfcc_t **input,
-                     float32 **output,
-                     int32 nframes);
-
-/**
- * Convert a block of float32 to mfcc_t (can be done in-place)
- **/
-SPHINXBASE_EXPORT
-int fe_float_to_mfcc(fe_t *fe,
-                     float32 **input,
-                     mfcc_t **output,
-                     int32 nframes);
-
-/**
- * Process one frame of log spectra into MFCC using discrete cosine
- * transform.
- *
- * This uses a variant of the DCT-II where the first frequency bin is
- * scaled by 0.5.  Unless somebody misunderstood the DCT-III equations
- * and thought that's what they were implementing here, this is
- * ostensibly done to account for the symmetry properties of the
- * DCT-II versus the DFT - the first coefficient of the input is
- * assumed to be repeated in the negative frequencies, which is not
- * the case for the DFT.  (This begs the question, why not just use
- * the DCT-I, since it has the appropriate symmetry properties...)
- * Moreover, this is bogus since the mel-frequency bins on which we
- * are doing the DCT don't extend to the edge of the DFT anyway.
- *
- * This also means that the matrix used in computing this DCT can not
- * be made orthogonal, and thus inverting the transform is difficult.
- * Therefore if you want to do cepstral smoothing or have some other
- * reason to invert your MFCCs, use fe_logspec_dct2() and its inverse
- * fe_logspec_dct3() instead.
- *
- * Also, it normalizes by 1/nfilt rather than 2/nfilt, for some reason.
- **/
-SPHINXBASE_EXPORT
-int fe_logspec_to_mfcc(fe_t *fe,  /**< A fe structure */
-                       const mfcc_t *fr_spec, /**< One frame of spectrum */
-                       mfcc_t *fr_cep /**< One frame of cepstrum */
-        );
-
-/**
- * Convert log spectra to MFCC using DCT-II.
- *
- * This uses the "unitary" form of the DCT-II, i.e. with a scaling
- * factor of sqrt(2/N) and a "beta" factor of sqrt(1/2) applied to the
- * cos(0) basis vector (i.e. the one corresponding to the DC
- * coefficient in the output).
- **/
-SPHINXBASE_EXPORT
-int fe_logspec_dct2(fe_t *fe,  /**< A fe structure */
-                    const mfcc_t *fr_spec, /**< One frame of spectrum */
-                    mfcc_t *fr_cep /**< One frame of cepstrum */
-        );
-
-/**
- * Convert MFCC to log spectra using DCT-III.
- *
- * This uses the "unitary" form of the DCT-III, i.e. with a scaling
- * factor of sqrt(2/N) and a "beta" factor of sqrt(1/2) applied to the
- * cos(0) basis vector (i.e. the one corresponding to the DC
- * coefficient in the input).
- **/
-SPHINXBASE_EXPORT
-int fe_mfcc_dct3(fe_t *fe,  /**< A fe structure */
-                 const mfcc_t *fr_cep, /**< One frame of cepstrum */
-                 mfcc_t *fr_spec /**< One frame of spectrum */
-        );
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif