kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-01 11:02:53 +00:00
Code Issues Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
Steve Underwood 2013-09-13 23:44:10 +08:00
parent 378648f2b1
commit fb238ed997
3 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libs/spandsp/src/dtmf.c
View File

@ -71,21 +71,24 @@
#define DTMF_SAMPLES_PER_BLOCK 102 #define DTMF_SAMPLES_PER_BLOCK 102
#if defined(SPANDSP_USE_FIXED_POINT) #if defined(SPANDSP_USE_FIXED_POINT)
#define DTMF_THRESHOLD 10438 /* -42dBm0 */ /* The fixed point version scales the 16 bit signal down by 7 bits, so the Goertzels will fit in a 32 bit word */
#define DTMF_NORMAL_TWIST 6.309f /* 8dB */ #define FP_SCALE(x) ((int16_t) (x/128.0 + ((x >= 0.0) ? 0.5 : -0.5)))
#define DTMF_REVERSE_TWIST 2.512f /* 4dB */ #define DTMF_THRESHOLD 10438 /* -42dBm0 [((DTMF_SAMPLES_PER_BLOCK*32768.0/1.4142)*10^((-42 - DBM0_MAX_SINE_POWER)/20.0)/128.0)^2]*/
#define DTMF_RELATIVE_PEAK_ROW 6.309f /* 8dB */ #define DTMF_NORMAL_TWIST 6.309f /* 8dB [10.0^(8.0/10.0)] */
#define DTMF_RELATIVE_PEAK_COL 6.309f /* 8dB */ #define DTMF_REVERSE_TWIST 2.512f /* 4dB [10.0^(4.0/10.0)] */
#define DTMF_TO_TOTAL_ENERGY 83.868f /* -0.85dB */ #define DTMF_RELATIVE_PEAK_ROW 6.309f /* 8dB [10.0^(8.0/10.0)] */
#define DTMF_POWER_OFFSET 68.251f /* 10*log(256.0*256.0*DTMF_SAMPLES_PER_BLOCK) */ #define DTMF_RELATIVE_PEAK_COL 6.309f /* 8dB [10.0^(8.0/10.0)] */
#else
#define DTMF_THRESHOLD 171032462.0f /* -42dBm0 [((DTMF_SAMPLES_PER_BLOCK*32768.0/1.4142)*10^((-42 - DBM0_MAX_SINE_POWER)/20.0))^2] */
#define DTMF_NORMAL_TWIST 6.309f /* 8dB [10^(8/10) => 6.309] */
#define DTMF_REVERSE_TWIST 2.512f /* 4dB */
#define DTMF_RELATIVE_PEAK_ROW 6.309f /* 8dB */
#define DTMF_RELATIVE_PEAK_COL 6.309f /* 8dB */
#define DTMF_TO_TOTAL_ENERGY 83.868f /* -0.85dB [DTMF_SAMPLES_PER_BLOCK*10^(-0.85/10.0)] */ #define DTMF_TO_TOTAL_ENERGY 83.868f /* -0.85dB [DTMF_SAMPLES_PER_BLOCK*10^(-0.85/10.0)] */
#define DTMF_POWER_OFFSET 110.395f /* 10*log(32768.0*32768.0*DTMF_SAMPLES_PER_BLOCK) */ #define DTMF_POWER_OFFSET 68.251f /* 10*log(((32768.0/128.0)^2)*DTMF_SAMPLES_PER_BLOCK) */
#else
#define FP_SCALE(x) (x)
#define DTMF_THRESHOLD 171032462.0f /* -42dBm0 [((DTMF_SAMPLES_PER_BLOCK*32768.0/1.4142)*10^((-42 - DBM0_MAX_SINE_POWER)/20.0))^2] */
#define DTMF_NORMAL_TWIST 6.309f /* 8dB [10.0^(8.0/10.0)] */
#define DTMF_REVERSE_TWIST 2.512f /* 4dB [10.0^(4.0/10.0)] */
#define DTMF_RELATIVE_PEAK_ROW 6.309f /* 8dB [10.0^(8.0/10.0)] */
#define DTMF_RELATIVE_PEAK_COL 6.309f /* 8dB [10.0^(8.0/10.0)] */
#define DTMF_TO_TOTAL_ENERGY 83.868f /* -0.85dB [DTMF_SAMPLES_PER_BLOCK*10^(-0.85/10.0)] */
#define DTMF_POWER_OFFSET 110.395f /* 10*log((32768.0^2)*DTMF_SAMPLES_PER_BLOCK) */
#endif #endif
static const float dtmf_row[] = static const float dtmf_row[] =
@ -303,11 +306,7 @@ SPAN_DECLARE(int) dtmf_rx(dtmf_rx_state_t *s, const int16_t amp[], int samples)
s->in_digit = hit; s->in_digit = hit;
} }
s->last_hit = hit; s->last_hit = hit;
#if defined(SPANDSP_USE_FIXED_POINT) s->energy = FP_SCALE(0.0f);
s->energy = 0;
#else
s->energy = 0.0f;
#endif
s->current_sample = 0; s->current_sample = 0;
} }
if (s->current_digits && s->digits_callback) if (s->current_digits && s->digits_callback)
@ -330,11 +329,7 @@ SPAN_DECLARE(int) dtmf_rx_fillin(dtmf_rx_state_t *s, int samples)
goertzel_reset(&s->row_out[i]); goertzel_reset(&s->row_out[i]);
goertzel_reset(&s->col_out[i]); goertzel_reset(&s->col_out[i]);
} }
#if defined(SPANDSP_USE_FIXED_POINT) s->energy = FP_SCALE(0.0f);
s->energy = 0;
#else
s->energy = 0.0f;
#endif
s->current_sample = 0; s->current_sample = 0;
/* Don't update the hit detection. Pretend it never happened. */ /* Don't update the hit detection. Pretend it never happened. */
/* TODO: Surely we can be cleverer than this. */ /* TODO: Surely we can be cleverer than this. */
@ -399,7 +394,11 @@ SPAN_DECLARE(void) dtmf_rx_parms(dtmf_rx_state_t *s,
s->reverse_twist = powf(10.0f, reverse_twist/10.0f); s->reverse_twist = powf(10.0f, reverse_twist/10.0f);
if (threshold > -99) if (threshold > -99)
{ {
#if defined(SPANDSP_USE_FIXED_POINT)
x = (DTMF_SAMPLES_PER_BLOCK*32768.0f/(128.0f*1.4142f))*powf(10.0f, (threshold - DBM0_MAX_SINE_POWER)/20.0f);
#else
x = (DTMF_SAMPLES_PER_BLOCK*32768.0f/1.4142f)*powf(10.0f, (threshold - DBM0_MAX_SINE_POWER)/20.0f); x = (DTMF_SAMPLES_PER_BLOCK*32768.0f/1.4142f)*powf(10.0f, (threshold - DBM0_MAX_SINE_POWER)/20.0f);
#endif
s->threshold = x*x; s->threshold = x*x;
} }
} }
@ -451,11 +450,7 @@ SPAN_DECLARE(dtmf_rx_state_t *) dtmf_rx_init(dtmf_rx_state_t *s,
goertzel_init(&s->row_out[i], &dtmf_detect_row[i]); goertzel_init(&s->row_out[i], &dtmf_detect_row[i]);
goertzel_init(&s->col_out[i], &dtmf_detect_col[i]); goertzel_init(&s->col_out[i], &dtmf_detect_col[i]);
} }
#if defined(SPANDSP_USE_FIXED_POINT) s->energy = FP_SCALE(0.0f);
s->energy = 0;
#else
s->energy = 0.0f;
#endif
s->current_sample = 0; s->current_sample = 0;
s->lost_digits = 0; s->lost_digits = 0;
s->current_digits = 0; s->current_digits = 0;

33
libs/spandsp/src/t85_decode.c
View File

@ -267,14 +267,45 @@ static int finish_sde(t85_decode_state_t *s)
SPAN_DECLARE(bool) t85_analyse_header(uint32_t *width, uint32_t *length, const uint8_t data[], size_t len) SPAN_DECLARE(bool) t85_analyse_header(uint32_t *width, uint32_t *length, const uint8_t data[], size_t len)
{ {
uint32_t i;
uint32_t skip;
if (len < 20) if (len < 20)
{
*width = 0;
*length = 0;
return false; return false;
}
*width = pack_32(&data[6]); *width = pack_32(&data[6]);
*length = pack_32(&data[10]); *length = pack_32(&data[10]);
if ((data[19] & T85_VLENGTH)) if ((data[19] & T85_VLENGTH))
{ {
/* TODO: scan for a true length, if the initial one just says 0xFFFFFFFF */
/* There should be an image length sequence terminating the image later on. */ /* There should be an image length sequence terminating the image later on. */
/* TODO: scan for a true length, instead of this fudge */
for (i = 20; i < len - 6; i++)
{
if (data[i] == T82_ESC)
{
if (data[i + 1] == T82_COMMENT)
{
skip = pack_32(&data[2]);
if ((skip + 6) > (len - i))
break;
i += (6 + skip - 1);
}
else if (data[i + 1] == T82_ATMOVE)
{
i += (8 - 1);
}
else if (data[i + 1] == T82_NEWLEN)
{
/* We are only allow to have one of these, so if we find one
we should not look any further. */
*length = pack_32(&data[i + 2]);
break;
}
}
}
} }
return true; return true;
} }

4
libs/spandsp/tests/dtmf_rx_tests.c
View File

@ -675,11 +675,11 @@ static void mitel_cm7291_side_2_and_bellcore_tests(void)
{ {
if (hit_types[i]) if (hit_types[i])
{ {
printf(" Digit %c had %d false hits\n", i, hit_types[i]); printf(" Digit %c had %d false hits.\n", i, hit_types[i]);
j += hit_types[i]; j += hit_types[i];
} }
} }
printf(" %d hits in total\n", j); printf(" %d false hits in total.\n", j);
if (j > 470) if (j > 470)
{ {
printf(" Failed\n"); printf(" Failed\n");