git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10497 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2008-11-21 16:14:02 +00:00
parent 2c10f201e4
commit 52badf996d
2 changed files with 18 additions and 3 deletions
+8 -3
View File
@@ -702,9 +702,13 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
*frame = NULL;
return SWITCH_STATUS_GENERR;
}
if (tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) {
if (!tech_pvt->read_codec.implementation->encoded_bytes_per_packet) {
tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
goto skip;
}
if (tech_pvt->check_frames < MAX_CODEC_CHECK_FRAMES) {
if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) {
if (++tech_pvt->mismatch_count >= MAX_MISMATCH_FRAMES) {
switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp -
@@ -712,6 +716,7 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
if ((codec_ms % 10) != 0) {
tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
goto skip;
} else {
if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) {
const char *val;
@@ -770,13 +775,13 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
}
}
tech_pvt->check_frames++;
}
} else {
tech_pvt->mismatch_count = 0;
}
tech_pvt->last_ts = tech_pvt->read_frame.timestamp;
}
skip:
if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet)) {
frames = (tech_pvt->read_frame.datalen / bytes);