git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7879 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-03-12 13:41:30 +00:00
parent e2b5543df9
commit 2d67d681b6
1 changed files with 7 additions and 7 deletions

View File

@ -1141,8 +1141,13 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
if (bytes) {
check++;
switch_core_timer_sync(&rtp_session->timer);
} else {
check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS);
}
check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS);
}
if (check) {
do_2833(rtp_session);
}
if (bytes && rtp_session->recv_msg.header.version != 2) {
@ -1303,8 +1308,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
}
}
if (check) {
do_2833(rtp_session);
if (check || (bytes && !rtp_session->timer.interval)) {
if (!bytes && rtp_session->max_missed_packets) {
if (++rtp_session->missed_count >= rtp_session->max_missed_packets) {
ret = -2;
@ -1401,10 +1405,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
*flags |= SFF_CNG;
}
if (bytes > 0) {
do_2833(rtp_session);
}
ret = (int) bytes;
} else {
ret = -1;