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

alternate which devices we support with the ones we don't using rfc2833

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4204 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-02-12 18:22:30 +00:00
parent 62a44e621f
commit f2c46f504c
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/switch_rtp.c
View File

@ -135,6 +135,8 @@ struct switch_rtp {
void *private_data; void *private_data;
uint32_t ts; uint32_t ts;
uint32_t last_write_ts;
uint16_t last_write_seq;
uint32_t flags; uint32_t flags;
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_sockaddr_t *from_addr; switch_sockaddr_t *from_addr;
@ -655,13 +657,16 @@ static void do_2833(switch_rtp_t *rtp_session)
for (x = 0; x < loops; x++) { for (x = 0; x < loops; x++) {
switch_rtp_write_manual(rtp_session, switch_rtp_write_manual(rtp_session,
rtp_session->dtmf_data.out_digit_packet, 4, 0, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_packet, 4, 0, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf,
rtp_session->dtmf_data.out_digit_seq++, &flags); rtp_session->dtmf_data.out_digit_seq, &flags);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n",
loops == 1 ? "middle" : "end", loops == 1 ? "middle" : "end",
rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.out_digit,
rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.timestamp_dtmf,
rtp_session->dtmf_data.out_digit_sofar, rtp_session->dtmf_data.out_digit_sofar,
duration); duration,
rtp_session->dtmf_data.out_digit_seq);
rtp_session->dtmf_data.out_digit_seq++;
} }
} }
@ -680,7 +685,10 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->dtmf_data.out_digit_packet[1] = 7; rtp_session->dtmf_data.out_digit_packet[1] = 7;
//ts = rtp_session->dtmf_data.timestamp_dtmf += samples; //ts = rtp_session->dtmf_data.timestamp_dtmf += samples;
rtp_session->dtmf_data.timestamp_dtmf++; //rtp_session->dtmf_data.timestamp_dtmf++;
rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts;
rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq;
for (x = 0; x < 3; x++) { for (x = 0; x < 3; x++) {
@ -690,15 +698,17 @@ static void do_2833(switch_rtp_t *rtp_session)
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->dtmf_data.out_digit_seq++, rtp_session->dtmf_data.out_digit_seq,
&flags); &flags);
switch_log_printf(SWITCH_CHANNEL_LOG, switch_log_printf(SWITCH_CHANNEL_LOG,
SWITCH_LOG_DEBUG, SWITCH_LOG_DEBUG,
"Send start packet for [%c] ts=%d sofar=%u dur=%d\n", "Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n",
rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.out_digit,
rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.timestamp_dtmf,
rtp_session->dtmf_data.out_digit_sofar, rtp_session->dtmf_data.out_digit_sofar,
0); 0,
rtp_session->dtmf_data.out_digit_seq);
rtp_session->dtmf_data.out_digit_seq++;
} }
free(rdigit); free(rdigit);
@ -1183,6 +1193,9 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
} }
} }
rtp_session->last_write_ts = ntohl(send_msg->header.ts);
rtp_session->last_write_seq = ntohs(send_msg->header.seq);
if (send) { if (send) {
switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes);
} }
@ -1299,7 +1312,6 @@ SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, void *dat
return -1; return -1;
} }
rtp_session->ts += ts;
rtp_session->send_msg.header.seq = htons(mseq); rtp_session->send_msg.header.seq = htons(mseq);
rtp_session->send_msg.header.ts = htonl(ts); rtp_session->send_msg.header.ts = htonl(ts);