Merge pull request #594 in FS/freeswitch from bugfix/FS-8425-dtmf-sometimes-missed-on-pstn-call to master

* commit '56a10538dc6307fb285dd1f3a31b384f0e5750fa':
  FS-8425 #resolve [DTMF sometimes missed on PSTN call]
This commit is contained in:
Anthony Minessale II 2015-11-13 10:56:08 -06:00
commit cb7065f7b0

View File

@ -5508,7 +5508,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
if (rtp_session->last_rtp_hdr.pt == rtp_session->recv_te || if (rtp_session->last_rtp_hdr.pt == rtp_session->recv_te ||
(*bytes < rtp_header_len && *bytes > 0) || (*bytes < rtp_header_len && *bytes > 0) ||
rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA] || rtp_session->flags[SWITCH_RTP_FLAG_UDPTL]) { rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA] || rtp_session->flags[SWITCH_RTP_FLAG_UDPTL]) {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_BREAK;
} }
if (ts) { if (ts) {
@ -6103,10 +6103,10 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
goto rtcp; goto rtcp;
} }
//if (status != SWITCH_STATUS_FALSE) { if (status == SWITCH_STATUS_BREAK) {
// read_pretriggered = 1; read_pretriggered = 1;
// break; break;
//} }
} }
} else if ((rtp_session->flags[SWITCH_RTP_FLAG_AUTOFLUSH] || rtp_session->flags[SWITCH_RTP_FLAG_STICKY_FLUSH])) { } else if ((rtp_session->flags[SWITCH_RTP_FLAG_AUTOFLUSH] || rtp_session->flags[SWITCH_RTP_FLAG_STICKY_FLUSH])) {