FS-3678 --resolve

src/include/switch_types.h

@@ -1181,6 +1181,7 @@ typedef enum {
 	CF_BRIDGE_NOWRITE,
 	CF_RECOVERED,
 	CF_JITTERBUFFER,
+	CF_JITTERBUFFER_PLC,
 	CF_DIALPLAN,
 	CF_BLOCK_BROADCAST_UNTIL_MEDIA,
 	CF_CNG_PLC,

src/mod/endpoints/mod_sofia/mod_sofia.c

@@ -1505,6 +1505,9 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 										  SWITCH_LOG_DEBUG, "Setting Jitterbuffer to %dms (%d frames) (%d max frames) (%d max drift)\n", 
 										  len, qlen, maxqlen, max_drift);
 						switch_channel_set_flag(tech_pvt->channel, CF_JITTERBUFFER);
+						if (!switch_false(switch_channel_get_variable(tech_pvt->channel, "sip_jitter_buffer_plc"))) {
+							switch_channel_set_flag(tech_pvt->channel, CF_JITTERBUFFER_PLC);
+						}
 					} else {
 						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), 
 										  SWITCH_LOG_WARNING, "Error Setting Jitterbuffer to %dms (%d frames)\n", len, qlen);

src/mod/endpoints/mod_sofia/sofia_glue.c

@@ -3324,6 +3324,9 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), 
 									  SWITCH_LOG_DEBUG, "Setting Jitterbuffer to %dms (%d frames)\n", jb_msec, qlen);
 					switch_channel_set_flag(tech_pvt->channel, CF_JITTERBUFFER);
+					if (!switch_false(switch_channel_get_variable(tech_pvt->channel, "sip_jitter_buffer_plc"))) {
+						switch_channel_set_flag(tech_pvt->channel, CF_JITTERBUFFER_PLC);
+					}
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), 
 									  SWITCH_LOG_WARNING, "Error Setting Jitterbuffer to %dms (%d frames)\n", jb_msec, qlen);

src/switch_core_io.c

@@ -369,7 +369,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 				}
 				
 				if (status == SWITCH_STATUS_SUCCESS) {
-					if ((switch_channel_test_flag(session->channel, CF_JITTERBUFFER) || switch_channel_test_flag(session->channel, CF_CNG_PLC)) 
+					if ((switch_channel_test_flag(session->channel, CF_JITTERBUFFER_PLC) || switch_channel_test_flag(session->channel, CF_CNG_PLC)) 
 						&& !session->plc) {
 						session->plc = plc_init(NULL);
 					}

src/switch_core_session.c

@@ -1611,6 +1611,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_xml(switch_e
 	flags[CF_BRIDGE_NOWRITE] = 0;
 	flags[CF_RECOVERED] = 0;
 	flags[CF_JITTERBUFFER] = 0;
+	flags[CF_JITTERBUFFER_PLC] = 0;
 	flags[CF_DIALPLAN] = 0;
 	flags[CF_BLOCK_BROADCAST_UNTIL_MEDIA] = 0;
 	flags[CF_CNG_PLC] = 0;