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

dtmf nightmare continues

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7146 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-08 21:43:09 +00:00
parent e9ca238cc9
commit 0eb142b552
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/switch_rtp.c
View File

@ -798,6 +798,11 @@ static void do_2833(switch_rtp_t *rtp_session)
int x, loops = 1, duration; int x, loops = 1, duration;
rtp_session->dtmf_data.out_digit_sofar += samples; rtp_session->dtmf_data.out_digit_sofar += samples;
if (rtp_session->dtmf_data.out_digit_sofar > 0xFFFF) {
rtp_session->dtmf_data.out_digit_sofar = samples;
rtp_session->dtmf_data.timestamp_dtmf += 0xFFFF;
}
if (rtp_session->dtmf_data.out_digit_sofar >= rtp_session->dtmf_data.out_digit_dur) { if (rtp_session->dtmf_data.out_digit_sofar >= rtp_session->dtmf_data.out_digit_dur) {
duration = rtp_session->dtmf_data.out_digit_dur; duration = rtp_session->dtmf_data.out_digit_dur;
rtp_session->dtmf_data.out_digit_packet[1] |= 0x80; rtp_session->dtmf_data.out_digit_packet[1] |= 0x80;
@ -809,7 +814,7 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8);
rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration;
rtp_session->dtmf_data.timestamp_dtmf += samples;
for (x = 0; x < loops; x++) { for (x = 0; x < loops; x++) {
rtp_session->seq++; rtp_session->seq++;
@ -835,11 +840,10 @@ static void do_2833(switch_rtp_t *rtp_session)
void *pop; void *pop;
if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) {
int x;
switch_dtmf_t *rdigit = pop; switch_dtmf_t *rdigit = pop;
memset(rtp_session->dtmf_data.out_digit_packet, 0, 4); memset(rtp_session->dtmf_data.out_digit_packet, 0, 4);
rtp_session->dtmf_data.out_digit_sofar = 0; rtp_session->dtmf_data.out_digit_sofar = samples;
rtp_session->dtmf_data.out_digit_dur = rdigit->duration; rtp_session->dtmf_data.out_digit_dur = rdigit->duration;
rtp_session->dtmf_data.out_digit = rdigit->digit; rtp_session->dtmf_data.out_digit = rdigit->digit;
rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit);
@ -853,22 +857,26 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->sending_dtmf = 1; rtp_session->sending_dtmf = 1;
for (x = 0; x < 3; x++) {
rtp_session->seq++; rtp_session->seq++;
switch_rtp_write_manual(rtp_session, switch_rtp_write_manual(rtp_session,
rtp_session->dtmf_data.out_digit_packet, rtp_session->dtmf_data.out_digit_packet,
4, 4,
switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1, switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1,
rtp_session->te, rtp_session->te,
rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.timestamp_dtmf,
rtp_session->seq, rtp_session->seq,
rtp_session->dtmf_data.out_digit_ssrc, &flags); rtp_session->dtmf_data.out_digit_ssrc, &flags);
switch_log_printf(SWITCH_CHANNEL_LOG,
SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_LOG,
"Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", SWITCH_LOG_DEBUG,
rtp_session->dtmf_data.out_digit, "Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n",
rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->seq); rtp_session->dtmf_data.out_digit,
} rtp_session->dtmf_data.timestamp_dtmf,
rtp_session->dtmf_data.out_digit_sofar,
0,
rtp_session->seq);
free(rdigit); free(rdigit);
} }
} }