diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-17 02:19:03 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-17 02:19:03 +0000 |
commit | e2cab742b1d41becf87d7b21e4b451370e8a7c12 (patch) | |
tree | 2766ab70c7472182f7adeca4b66bd8545b0170e3 /mec.h | |
parent | 51be44f5b34ffe5032414266787aca1aa8213316 (diff) |
don't include the echo canceller headers in every module that includes zaptel.h... instead, only in zaptel.c
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@867 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'mec.h')
-rw-r--r-- | mec.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -53,7 +53,7 @@ #define HANG_T 600 /* 600 samples, or 75ms */ -typedef struct mark_ec { +struct echo_can_state { /* Circular position */ int cpos; short y[NUM_TAPS]; /* Last N samples (relative to cpos) transmitted */ @@ -80,7 +80,7 @@ typedef struct mark_ec { int lastmax; /* Optimize maximum search */ int maxTy; /* Maximum Ty */ -} echo_can_state_t; +}; #define INLINE inline @@ -98,11 +98,11 @@ typedef struct mark_ec { #define FREE(a) free(a) #endif -static INLINE echo_can_state_t *echo_can_create(int len, int adaption_mode) +static INLINE struct echo_can_state *echo_can_create(int len, int adaption_mode) { - echo_can_state_t *ec; + struct echo_can_state *ec; /* Uhm, we're only one length, sorry. */ - ec = MALLOC(sizeof(echo_can_state_t)); + ec = MALLOC(sizeof(struct echo_can_state)); if (ec) memset(ec, 0, sizeof(*ec)); return ec; @@ -111,12 +111,12 @@ static INLINE echo_can_state_t *echo_can_create(int len, int adaption_mode) #define PASSPOS 32000 #undef PASSPOS -static INLINE void echo_can_free(echo_can_state_t *ec) +static INLINE void echo_can_free(struct echo_can_state *ec) { FREE(ec); } -static INLINE int16_t echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t rx) +static INLINE int16_t echo_can_update(struct echo_can_state *ec, int16_t tx, int16_t rx) { /* Process a sample, where tx is the near end and rx is the far end + echo */ @@ -292,7 +292,7 @@ static INLINE int16_t echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t return suppr; } -static inline int echo_can_traintap(echo_can_state_t *ec, int pos, short val) +static inline int echo_can_traintap(struct echo_can_state *ec, int pos, short val) { /* Reset hang counter to avoid adjustments after initial forced training */ |