kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sync 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6180 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-11-07 21:16:38 +00:00
parent 06f08e79a7
commit de8928f33b
4 changed files with 187 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/libteletone/src/libteletone_detect.c
View File

@ -130,7 +130,7 @@ void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state,
}
}
#define teletone_goertzel_result(gs) ((gs)->v3 * (gs)->v3 + (gs)->v2 * (gs)->v2 - (gs)->v2 * (gs)->v3 * (gs)->fac)
#define teletone_goertzel_result(gs) (float)(((gs)->v3 * (gs)->v3 + (gs)->v2 * (gs)->v2 - (gs)->v2 * (gs)->v3 * (gs)->fac))
void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate)
{
@ -141,16 +141,16 @@ void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state,
for (i = 0; i < GRID_FACTOR; i++) {
theta = (float)(M_TWO_PI*(dtmf_row[i]/(float)sample_rate));
dtmf_detect_row[i].fac = (float)(2.0f*cos(theta));
dtmf_detect_row[i].fac = (float)(2.0*cos(theta));
theta = (float)(M_TWO_PI*(dtmf_col[i]/(float)sample_rate));
dtmf_detect_col[i].fac = (float)(2.0f*cos(theta));
dtmf_detect_col[i].fac = (float)(2.0*cos(theta));
theta = (float)(M_TWO_PI*(dtmf_row[i]*2.0/(float)sample_rate));
dtmf_detect_row_2nd[i].fac = (float)(2.0f*cos(theta));
dtmf_detect_row_2nd[i].fac = (float)(2.0*cos(theta));
theta = (float)(M_TWO_PI*(dtmf_col[i]*2.0/(float)sample_rate));
dtmf_detect_col_2nd[i].fac = (float)(2.0f*cos(theta));
dtmf_detect_col_2nd[i].fac = (float)(2.0*cos(theta));
goertzel_init (&dtmf_detect_state->row_out[i], &dtmf_detect_row[i]);
goertzel_init (&dtmf_detect_state->col_out[i], &dtmf_detect_col[i]);
@ -197,7 +197,7 @@ void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *ma
}
mt->tone_count++;
theta = (float)(M_TWO_PI*(map->freqs[x]/(float)mt->sample_rate));
mt->tdd[x].fac = (float)(2.0f * cos(theta));
mt->tdd[x].fac = (float)(2.0 * cos(theta));
goertzel_init (&mt->gs[x], &mt->tdd[x]);
goertzel_init (&mt->gs2[x], &mt->tdd[x]);
}
@ -348,15 +348,15 @@ int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state,
}
/* We are at the end of a DTMF detection block */
/* Find the peak row and the peak column */
row_energy[0] = (float)(teletone_goertzel_result (&dtmf_detect_state->row_out[0]));
col_energy[0] = (float)(teletone_goertzel_result (&dtmf_detect_state->col_out[0]));
row_energy[0] = teletone_goertzel_result (&dtmf_detect_state->row_out[0]);
col_energy[0] = teletone_goertzel_result (&dtmf_detect_state->col_out[0]);
for (best_row = best_col = 0, i = 1; i < GRID_FACTOR; i++) {
row_energy[i] = (float)(teletone_goertzel_result (&dtmf_detect_state->row_out[i]));
row_energy[i] = teletone_goertzel_result (&dtmf_detect_state->row_out[i]);
if (row_energy[i] > row_energy[best_row]) {
best_row = i;
}
col_energy[i] = (float)(teletone_goertzel_result (&dtmf_detect_state->col_out[i]));
col_energy[i] = teletone_goertzel_result (&dtmf_detect_state->col_out[i]);
if (col_energy[i] > col_energy[best_col]) {
best_col = i;
}

5
libs/libteletone/src/libteletone_generate.c
View File

@ -219,7 +219,8 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
if (map->freqs[0] > 0) {
for (freqlen = 0; map->freqs[freqlen] && freqlen < TELETONE_MAX_TONES; freqlen++) {
teletone_dds_state_set_tone(&tones[freqlen], map->freqs[freqlen], ts->rate, vol);
teletone_dds_state_set_tone(&tones[freqlen], map->freqs[freqlen], ts->rate, 0);
teletone_dds_state_set_tx_level(&tones[freqlen], vol);
}
if (ts->channels > 1) {
@ -249,7 +250,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
sample = 128;
for (i = 0; i < freqlen; i++) {
int32_t s = teletone_dds_modulate_sample(&tones[i]);
int32_t s = teletone_dds_state_modulate_sample(&tones[i], 0);
sample += s;
}
sample /= freqlen;

40
libs/libteletone/src/libteletone_generate.h
View File

@ -80,8 +80,9 @@ extern "C" {
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
#undef inline
#define inline __inline
#ifndef __inline__
#define __inline__ __inline
#endif
typedef unsigned __int64 uint64_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int16 uint16_t;
@ -111,12 +112,12 @@ extern float powf (float, float);
#define TELETONE_VOL_DB_MAX 0
#define TELETONE_VOL_DB_MIN -63
#define MAX_PHASE_TONES 4
struct teletone_dds_state {
uint32_t phase_rate;
uint32_t phase_rate[MAX_PHASE_TONES];
uint32_t scale_factor;
uint32_t phase_accumulator;
int16_t sample;
teletone_process_t tx_level;
};
typedef struct teletone_dds_state teletone_dds_state_t;
@ -130,11 +131,20 @@ typedef struct teletone_dds_state teletone_dds_state_t;
extern int16_t TELETONE_SINES[SINE_TABLE_MAX];
static inline int16_t teletone_dds_modulate_sample(teletone_dds_state_t *dds)
static __inline__ int32_t teletone_dds_phase_rate(teletone_process_t tone, uint32_t rate)
{
return (int32_t) ((tone * MAX_PHASE_ACCUMULATOR) / rate);
}
static __inline__ int16_t teletone_dds_state_modulate_sample(teletone_dds_state_t *dds, uint32_t pindex)
{
int32_t bitmask = dds->phase_accumulator, sine_index = (bitmask >>= 23) & SINE_TABLE_LEN;
int16_t sample;
if (pindex >= MAX_PHASE_TONES) {
pindex = 0;
}
if (bitmask & SINE_TABLE_MAX) {
sine_index = SINE_TABLE_LEN - sine_index;
}
@ -145,27 +155,29 @@ static inline int16_t teletone_dds_modulate_sample(teletone_dds_state_t *dds)
sample *= -1;
}
dds->phase_accumulator += dds->phase_rate;
dds->phase_accumulator += dds->phase_rate[pindex];
return (int16_t) (sample * dds->scale_factor >> 15);
}
static inline void teletone_dds_state_set_tx_level(teletone_dds_state_t *dds, float tx_level)
static __inline__ void teletone_dds_state_set_tx_level(teletone_dds_state_t *dds, float tx_level)
{
dds->scale_factor = (int) (powf(10.0f, (tx_level - DBM0_MAX_POWER) / 20.0f) * (32767.0f * 1.414214f));
dds->tx_level = tx_level;
}
static inline void teletone_dds_state_set_tone(teletone_dds_state_t *dds, teletone_process_t tone, uint32_t rate, float tx_level)
static __inline__ void teletone_dds_state_reset_accum(teletone_dds_state_t *dds)
{
dds->phase_accumulator = 0;
dds->phase_rate = (int32_t) ((tone * MAX_PHASE_ACCUMULATOR) / rate);
}
if (dds->tx_level != tx_level || !dds->scale_factor) {
teletone_dds_state_set_tx_level(dds, tx_level);
static __inline__ int teletone_dds_state_set_tone(teletone_dds_state_t *dds, teletone_process_t tone, uint32_t rate, uint32_t pindex)
{
if (pindex < MAX_PHASE_TONES) {
dds->phase_rate[pindex] = teletone_dds_phase_rate(tone, rate);
return 0;
}
dds->tx_level = tx_level;
return -1;
}