Commit 1f6cf519 authored by jm's avatar jm
Browse files

Moved the remaining of misc.h into arch.h


git-svn-id: http://svn.xiph.org/trunk/speex@14113 0101bb08-14d6-0310-b084-bc0e0c8e3800
parent e90f40cd
......@@ -23,7 +23,7 @@ libspeexdsp_la_SOURCES = preprocess.c smallft.c lbr_48k_tables.c \
noinst_HEADERS = arch.h cb_search_arm4.h cb_search_bfin.h cb_search_sse.h \
filters.h filters_arm4.h filters_bfin.h filters_sse.h fixed_arm4.h \
fixed_arm5e.h fixed_bfin.h fixed_debug.h lpc.h lpc_bfin.h ltp.h ltp_arm4.h \
ltp_sse.h math_approx.h misc.h misc_bfin.h nb_celp.h quant_lsp.h sb_celp.h \
ltp_sse.h math_approx.h misc_bfin.h nb_celp.h quant_lsp.h sb_celp.h \
stack_alloc.h vbr.h vq.h vq_arm4.h vq_bfin.h vq_sse.h cb_search.h fftwrap.h \
filterbank.h fixed_generic.h lsp.h lsp_bfin.h ltp_bfin.h modes.h os_support.h \
pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h
......
......@@ -45,7 +45,7 @@ struct kiss_fft_state{
C_ADDTO( res , a) : res += a
* */
#ifdef FIXED_POINT
#include "misc.h"
#include "arch.h"
# define FRACBITS 15
# define SAMPPROD spx_int32_t
#define SAMP_MAX 32767
......
......@@ -35,6 +35,39 @@
#ifndef ARCH_H
#define ARCH_H
#ifndef SPEEX_VERSION
#define SPEEX_MAJOR_VERSION 1 /**< Major Speex version. */
#define SPEEX_MINOR_VERSION 1 /**< Minor Speex version. */
#define SPEEX_MICRO_VERSION 15 /**< Micro Speex version. */
#define SPEEX_EXTRA_VERSION "" /**< Extra Speex version. */
#define SPEEX_VERSION "speex-1.2beta3" /**< Speex version string. */
#endif
/* A couple test to catch stupid option combinations */
#ifdef FIXED_POINT
#ifdef _USE_SSE
#error SSE is only for floating-point
#endif
#if ((defined (ARM4_ASM)||defined (ARM4_ASM)) && defined(BFIN_ASM)) || (defined (ARM4_ASM)&&defined(ARM5E_ASM))
#error Make up your mind. What CPU do you have?
#endif
#ifdef VORBIS_PSYCHO
#error Vorbis-psy model currently not implemented in fixed-point
#endif
#else
#if defined (ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM)
#error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions?
#endif
#ifdef FIXED_POINT_DEBUG
#error "Don't you think enabling fixed-point is a good thing to do if you want to debug that?"
#endif
#endif
#ifndef OUTSIDE_SPEEX
#include "speex/speex_types.h"
#endif
......@@ -192,4 +225,11 @@ typedef float spx_word32_t;
#endif
#ifdef FIXED_DEBUG
long long spx_mips=0;
#endif
#endif
......@@ -37,7 +37,7 @@
#endif
#include <speex/speex_bits.h>
#include "misc.h"
#include "arch.h"
#include "os_support.h"
/* Maximum size of the bit-stream (for fixed-size allocation) */
......
......@@ -37,7 +37,7 @@
#include "os_support.h"
#include "misc.h"
#include "arch.h"
#include <speex/speex_buffer.h>
struct SpeexBuffer_ {
......
......@@ -37,7 +37,7 @@
#include "filters.h"
#include "stack_alloc.h"
#include "vq.h"
#include "misc.h"
#include "arch.h"
#include "math_approx.h"
#include "os_support.h"
......
......@@ -36,7 +36,7 @@
#define CB_SEARCH_H
#include <speex/speex_bits.h>
#include "misc.h"
#include "arch.h"
/** Split codebook parameters. */
typedef struct split_cb_params {
......
......@@ -40,7 +40,7 @@
#define USE_KISS_FFT
#include "misc.h"
#include "arch.h"
#include "os_support.h"
#define MAX_FFT_SIZE 2048
......
......@@ -35,7 +35,7 @@
#ifndef FFTWRAP_H
#define FFTWRAP_H
#include "misc.h"
#include "arch.h"
/** Compute tables for an FFT */
void *spx_fft_init(int size);
......
......@@ -36,7 +36,7 @@
#endif
#include "filterbank.h"
#include "misc.h"
#include "arch.h"
#include <math.h>
#include "math_approx.h"
#include "os_support.h"
......
......@@ -34,7 +34,7 @@
#ifndef FILTERBANK_H
#define FILTERBANK_H
#include "misc.h"
#include "arch.h"
typedef struct {
int *bank_left;
......
......@@ -36,7 +36,7 @@
#include "filters.h"
#include "stack_alloc.h"
#include "misc.h"
#include "arch.h"
#include "math_approx.h"
#include "ltp.h"
#include <math.h>
......
......@@ -35,7 +35,7 @@
#ifndef FILTERS_H
#define FILTERS_H
#include "misc.h"
#include "arch.h"
spx_word16_t compute_rms(const spx_sig_t *x, int len);
spx_word16_t compute_rms16(const spx_word16_t *x, int len);
......
......@@ -52,7 +52,7 @@ TODO:
#endif
#include "misc.h"
#include "arch.h"
#include <speex/speex.h>
#include <speex/speex_bits.h>
#include <speex/speex_jitter.h>
......
......@@ -19,7 +19,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#endif
#include "_kiss_fft_guts.h"
#include "misc.h"
#include "arch.h"
#include "os_support.h"
/* The guts header contains all the multiplication and addition macros that are defined for
......
......@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <math.h>
#include "misc.h"
#include "arch.h"
#ifdef __cplusplus
extern "C" {
......@@ -32,7 +32,7 @@ extern "C" {
#ifdef FIXED_POINT
#include "misc.h"
#include "arch.h"
# define kiss_fft_scalar spx_int16_t
#else
# ifndef kiss_fft_scalar
......
......@@ -35,7 +35,7 @@
#ifndef LPC_H
#define LPC_H
#include "misc.h"
#include "arch.h"
void _spx_autocorr(
const spx_word16_t * x, /* in: [0...n-1] samples x */
......
......@@ -51,7 +51,7 @@ Modified by Jean-Marc Valin
#ifndef __AK2LSPD__
#define __AK2LSPD__
#include "misc.h"
#include "arch.h"
int lpc_to_lsp (spx_coef_t *a, int lpcrdr, spx_lsp_t *freq, int nb, spx_word16_t delta, char *stack);
void lsp_to_lpc(spx_lsp_t *freq, spx_coef_t *ak, int lpcrdr, char *stack);
......
......@@ -33,7 +33,7 @@
*/
#include <speex/speex_bits.h>
#include "misc.h"
#include "arch.h"
/** LTP parameters. */
typedef struct {
......
......@@ -35,7 +35,7 @@
#ifndef MATH_APPROX_H
#define MATH_APPROX_H
#include "misc.h"
#include "arch.h"
#ifndef FIXED_POINT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment