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

FSCORE-510 part 12 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15928 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-12-12 00:04:07 +00:00
parent 1a29281138
commit 288fa66341
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/switch_rtp.c
View File

@ -215,7 +215,6 @@ struct switch_rtp {
switch_rtp_stats_t stats; switch_rtp_stats_t stats;
uint32_t hot_hits; uint32_t hot_hits;
uint32_t sync_packets; uint32_t sync_packets;
uint32_t dtmf_wait;
#ifdef ENABLE_ZRTP #ifdef ENABLE_ZRTP
zrtp_session_t *zrtp_session; zrtp_session_t *zrtp_session;
@ -1605,7 +1604,6 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->next_write_samplecount = rtp_session->timer.samplecount + samples * 5; rtp_session->next_write_samplecount = rtp_session->timer.samplecount + samples * 5;
} }
rtp_session->dtmf_data.out_digit_dur = 0; rtp_session->dtmf_data.out_digit_dur = 0;
rtp_session->dtmf_wait = rtp_session->samples_per_interval ? ((rtp_session->samples_per_second / 4) / rtp_session->samples_per_interval) : 12;
} }
} }
@ -1618,11 +1616,7 @@ static void do_2833(switch_rtp_t *rtp_session)
} }
} }
if (rtp_session->dtmf_wait) { if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) {
rtp_session->dtmf_wait--;
}
if (!rtp_session->dtmf_wait && switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) {
switch_dtmf_t *rdigit = pop; switch_dtmf_t *rdigit = pop;
int64_t offset; int64_t offset;
switch_size_t wrote; switch_size_t wrote;
@ -1824,6 +1818,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
while (switch_rtp_ready(rtp_session)) { while (switch_rtp_ready(rtp_session)) {
int do_cng = 0; int do_cng = 0;
bytes = 0;
if (rtp_session->timer.interval) { if (rtp_session->timer.interval) {
if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) && if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) &&
@ -1857,6 +1852,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
} }
recvfrom: recvfrom:
bytes = 0;
if (!switch_rtp_ready(rtp_session)) { if (!switch_rtp_ready(rtp_session)) {
break; break;
@ -1966,12 +1962,10 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
if (bytes) { if (bytes) {
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ)) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ)) {
if (((rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) || rtp_session->recv_msg.header.pt == 13)) { if (((rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) || rtp_session->recv_msg.header.pt == 13)) {
bytes = 0;
goto recvfrom; goto recvfrom;
} }
} else if (!switch_cmp_addr(rtp_session->from_addr, rtp_session->remote_addr)) { } else if (!switch_cmp_addr(rtp_session->from_addr, rtp_session->remote_addr)) {
bytes = 0;
goto recvfrom; goto recvfrom;
} }
@ -2274,8 +2268,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
if (!switch_rtp_ready(rtp_session)) { if (!switch_rtp_ready(rtp_session)) {
goto end; goto end;
} }
switch_cond_next(); return_cng_frame();
goto recvfrom;
} }
timer_check: timer_check: