fix some regessions and sync namespace of some vars

src/mod/applications/mod_fifo/mod_fifo.c

@@ -1415,9 +1415,9 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
 
 	if (!total) goto end;
 
-	if ((codec = switch_event_get_header(pop, "variable_sip_use_codec_name"))) {
-		const char *rate = switch_event_get_header(pop, "variable_sip_use_codec_rate");
-		const char *ptime = switch_event_get_header(pop, "variable_sip_use_codec_ptime");
+	if ((codec = switch_event_get_header(pop, "variable_rtp_use_codec_name"))) {
+		const char *rate = switch_event_get_header(pop, "variable_rtp_use_codec_rate");
+		const char *ptime = switch_event_get_header(pop, "variable_rtp_use_codec_ptime");
 		char nstr[256] = "";
 
 		if (strcasecmp(codec, "PCMU") && strcasecmp(codec, "PCMA")) {

src/mod/applications/mod_fsv/mod_fsv.c

@@ -337,7 +337,7 @@ SWITCH_STANDARD_APP(play_fsv_function)
 		goto end;
 	}
 
-	switch_channel_set_variable(channel, "sip_force_video_fmtp", h.video_fmtp);
+	switch_channel_set_variable(channel, "rtp_force_video_fmtp", h.video_fmtp);
 	switch_channel_answer(channel);
 
 	if ((read_vid_codec = switch_core_session_get_video_read_codec(session))) {

src/mod/applications/mod_mp4/mod_mp4.cpp

@@ -415,7 +415,7 @@ SWITCH_STANDARD_APP(play_mp4_function)
 		}
 		*/
 
-		switch_channel_set_variable(channel, "sip_force_video_fmtp", vc.videoTrack().fmtp.c_str());
+		switch_channel_set_variable(channel, "rtp_force_video_fmtp", vc.videoTrack().fmtp.c_str());
 		switch_channel_answer(channel);
 
 		if ((read_vid_codec = switch_core_session_get_video_read_codec(session))) {

src/mod/endpoints/mod_sofia/mod_sofia.c

@@ -4274,7 +4274,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
 		if (!(vval = switch_channel_get_variable(o_channel, "sip_copy_multipart")) || switch_true(vval)) {
 			switch_ivr_transfer_variable(session, nsession, SOFIA_MULTIPART_PREFIX_T);
 		}
-		switch_ivr_transfer_variable(session, nsession, "sip_video_fmtp");
+		switch_ivr_transfer_variable(session, nsession, "rtp_video_fmtp");
 		switch_ivr_transfer_variable(session, nsession, "sip-force-contact");
 		switch_ivr_transfer_variable(session, nsession, "sip_sticky_contact");
 		if (!cid_locked) {

src/mod/endpoints/mod_sofia/rtp.c

@@ -646,7 +646,7 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 										  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"))) {
+						if (!switch_false(switch_channel_get_variable(tech_pvt->channel, "rtp_jitter_buffer_plc"))) {
 							switch_channel_set_flag(tech_pvt->channel, CF_JITTERBUFFER_PLC);
 						}
 					} else {

src/mod/endpoints/mod_sofia/sofia_glue.c

@@ -1829,14 +1829,14 @@ int sofia_recover_callback(switch_core_session_t *session)
 	tech_pvt->mparams.remote_port = atoi(switch_str_nil(switch_channel_get_variable(channel, "sip_network_port")));
 	tech_pvt->caller_profile = switch_channel_get_caller_profile(channel);
 
-	if ((tmp = switch_channel_get_variable(tech_pvt->channel, "sip_2833_send_payload"))) {
+	if ((tmp = switch_channel_get_variable(tech_pvt->channel, "rtp_2833_send_payload"))) {
 		int te = atoi(tmp);
 		if (te > 64) {
 			tech_pvt->te = te;
 		} 
 	}
 
-	if ((tmp = switch_channel_get_variable(tech_pvt->channel, "sip_2833_recv_payload"))) {
+	if ((tmp = switch_channel_get_variable(tech_pvt->channel, "rtp_2833_recv_payload"))) {
 		int te = atoi(tmp);
 		if (te > 64) {
 			tech_pvt->recv_te = te;
@@ -1884,7 +1884,7 @@ int sofia_recover_callback(switch_core_session_t *session)
 	switch_core_session_get_recovery_crypto_key(session, SWITCH_MEDIA_TYPE_AUDIO, "srtp_remote_audio_crypto_key");
 	switch_core_session_get_recovery_crypto_key(session, SWITCH_MEDIA_TYPE_VIDEO, "srtp_remote_video_crypto_key");
 
-	if ((tmp = switch_channel_get_variable(channel, "sip_local_sdp_str"))) {
+	if ((tmp = switch_channel_get_variable(channel, "rtp_local_sdp_str"))) {
 		tech_pvt->mparams.local_sdp_str = switch_core_session_strdup(session, tmp);
 	}