Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
This commit is contained in:
commit
a2d0ba5d17
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
bz="false"
|
bz="false"
|
||||||
|
|
||||||
BUNZUP=/usr/bin/bunzip2
|
BUNZIP=/usr/bin/bunzip2
|
||||||
TAR=@TAR@
|
TAR=@TAR@
|
||||||
ZCAT=@ZCAT@
|
ZCAT=@ZCAT@
|
||||||
WGET=@WGET@
|
WGET=@WGET@
|
||||||
|
|
|
@ -1446,6 +1446,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
|
||||||
{
|
{
|
||||||
const char *var = switch_channel_get_variable(tech_pvt->channel, "sip_jitter_buffer_during_bridge");
|
const char *var = switch_channel_get_variable(tech_pvt->channel, "sip_jitter_buffer_during_bridge");
|
||||||
|
|
||||||
|
sofia_glue_tech_track(tech_pvt->profile, session);
|
||||||
|
|
||||||
sofia_glue_tech_simplify(tech_pvt);
|
sofia_glue_tech_simplify(tech_pvt);
|
||||||
|
|
||||||
if (switch_false(var) && switch_rtp_ready(tech_pvt->rtp_session)) {
|
if (switch_false(var) && switch_rtp_ready(tech_pvt->rtp_session)) {
|
||||||
|
@ -1483,6 +1485,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
|
||||||
const char *val;
|
const char *val;
|
||||||
int ok = 0;
|
int ok = 0;
|
||||||
|
|
||||||
|
sofia_glue_tech_track(tech_pvt->profile, session);
|
||||||
|
|
||||||
if (switch_channel_test_flag(tech_pvt->channel, CF_JITTERBUFFER)) {
|
if (switch_channel_test_flag(tech_pvt->channel, CF_JITTERBUFFER)) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
|
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
|
||||||
"%s RESUME Jitterbuffer\n", switch_channel_get_name(channel));
|
"%s RESUME Jitterbuffer\n", switch_channel_get_name(channel));
|
||||||
|
|
Loading…
Reference in New Issue