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

FS-11154: [freeswitch-core] Improve audio sync during loss #resolve

This commit is contained in:
Anthony Minessale 2018-05-10 15:54:51 -05:00 committed by Mike Jerris
parent 8cbe796831
commit cc5dd29028
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/endpoints/mod_verto/mod_verto.c
View File

@ -2449,7 +2449,7 @@ static switch_status_t verto_set_media_options(verto_pvt_t *tech_pvt, verto_prof
tech_pvt->mparams->inbound_codec_string = switch_core_session_strdup(tech_pvt->session, profile->inbound_codec_string);
tech_pvt->mparams->outbound_codec_string = switch_core_session_strdup(tech_pvt->session, profile->outbound_codec_string);
tech_pvt->mparams->jb_msec = "-1";
tech_pvt->mparams->jb_msec = "1p:50p";
switch_media_handle_set_media_flag(tech_pvt->smh, SCMF_SUPPRESS_CNG);
//tech_pvt->mparams->auto_rtp_bugs = profile->auto_rtp_bugs;

8
src/switch_core_media.c
View File

@ -2487,6 +2487,7 @@ static void check_jb(switch_core_session_t *session, const char *input, int32_t
if (strchr(val, 'p') && jb_msec > 0) {
jb_msec *= -1;
if (!maxlen) maxlen = jb_msec * 50;
}
if ((p = strchr(val, ':'))) {
@ -2499,6 +2500,8 @@ static void check_jb(switch_core_session_t *session, const char *input, int32_t
}
}
if (!maxlen) maxlen = jb_msec * 50;
if (jb_msec < 0 && jb_msec > -1000) {
jb_msec = (a_engine->read_codec.implementation->microseconds_per_packet / 1000) * abs(jb_msec);
}
@ -2506,7 +2509,6 @@ static void check_jb(switch_core_session_t *session, const char *input, int32_t
if (maxlen < 0 && maxlen > -1000) {
maxlen = (a_engine->read_codec.implementation->microseconds_per_packet / 1000) * abs(maxlen);
}
if (jb_msec < 10 || jb_msec > 10000) {
@ -2599,7 +2601,7 @@ static void check_jb_sync(switch_core_session_t *session)
fps = video_globals.fps;
if (!fps) return;
if (fps < 15) return;
sync_audio = 1;
@ -2626,7 +2628,7 @@ static void check_jb_sync(switch_core_session_t *session)
jb_sync_msec, frames, video_globals.fps, sync_audio ? "yes" : "no", jb_sync_msec);
if (sync_audio) {
check_jb(session, NULL, jb_sync_msec, 0, SWITCH_TRUE);
check_jb(session, NULL, jb_sync_msec, jb_sync_msec * 2, SWITCH_TRUE);
}
video_globals.synced++;