Merge bc6842a950 into 3b58ebc5f3

We observed that the new Poly phones (formerly known as Polycom) were not getting sent a SIP UPDATE in certain circumstances (example: retrieving a parked call, and therefore, Caller ID would not show the parked caller). I renamed Polycom to Poly which will catch all Poly AND Polycom UA's. I also added Acrobits, and Ringotel to extend such functionality to those UA's. There were also other minor compatibility issues with the new Poly phones which have been resolved with tweaking the UA recognition on the code.

Co-authored-by: Joseph <junction1153@gmail.com>

src/mod/endpoints/mod_sofia/mod_sofia.c

@@ -254,7 +254,7 @@ char *generate_pai_str(private_object_t *tech_pvt)
 	callee_number = switch_sanitize_number(switch_core_session_strdup(session, callee_number));
 	callee_name = switch_sanitize_number(switch_core_session_strdup(session, callee_name));
 
-	if (!zstr(callee_number) && (zstr(ua) || !switch_stristr("polycom", ua))) {
+	if (!zstr(callee_number) && (zstr(ua) || !switch_stristr("poly", ua))) {
 		callee_number = switch_core_session_sprintf(session, "sip:%s@%s", callee_number, host);
 	}
 
@@ -2075,13 +2075,15 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 							nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
 									 TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), SIPTAG_PAYLOAD_STR(message), TAG_END());
 						} else if (update_allowed && ua && (switch_channel_var_true(tech_pvt->channel, "update_ignore_ua") ||
-									  switch_stristr("polycom", ua) ||
+									  switch_stristr("poly", ua) ||
 									  (switch_stristr("aastra", ua) && !switch_stristr("Intelligate", ua)) ||
 									  (switch_stristr("cisco/spa50", ua) ||
 									  switch_stristr("cisco/spa525", ua)) ||
 									  switch_stristr("cisco/spa30", ua) ||
 									  switch_stristr("Fanvil", ua) ||
 									  switch_stristr("Grandstream", ua) ||
+									  switch_stristr("Ringotel", ua) ||
+									  switch_stristr("Groundwire", ua) ||									  
 									  switch_stristr("Yealink", ua) ||
 									  switch_stristr("Mitel", ua) ||
 									  switch_stristr("Panasonic", ua))) {
@@ -2152,7 +2154,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 								 SIPTAG_PAYLOAD_STR(message),
 								 TAG_IF(!zstr(session_id_header), SIPTAG_HEADER_STR(session_id_header)),
 								 TAG_END());
-					} else if (ua && switch_stristr("polycom", ua)) {
+					} else if (ua && switch_stristr("poly", ua)) {
 						snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number);
 						nua_update(tech_pvt->nh,
 								   NUTAG_SESSION_TIMER(tech_pvt->session_timeout),

src/mod/endpoints/mod_sofia/sofia.c

@@ -10476,7 +10476,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 		(!is_tcp && !is_tls && (zstr(network_ip) || !switch_check_network_list_ip(network_ip, profile->local_network)) &&
 		 profile->server_rport_level >= 2 && sip->sip_user_agent &&
 		 sip->sip_user_agent->g_string &&
-		 (!strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) || !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20)))
+		 (!strncasecmp(sip->sip_user_agent->g_string, "Poly", 4) || !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20)))
 		) {
 		if (sip->sip_via) {
 			const char *port = sip->sip_via->v_port;

src/mod/endpoints/mod_sofia/sofia_presence.c

@@ -2501,7 +2501,7 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r
 {
 	char *ret = NULL;
 
-	if (switch_stristr("polycom", user_agent)) {
+	if (switch_stristr("poly", user_agent)) {
 		*ct = "application/xpidf+xml";
 
 		/* If unknown/none prpid is provided, just show the user as online. */

src/mod/endpoints/mod_sofia/sofia_reg.c

@@ -1661,7 +1661,7 @@ uint8_t sofia_reg_handle_register_token(nua_t *nua, sofia_profile_t *profile, nu
 			if (!is_tcp && !is_tls && (zstr(network_ip) || !switch_check_network_list_ip(network_ip, profile->local_network)) &&
 				profile->server_rport_level >= 2 && sip->sip_user_agent &&
 				sip->sip_user_agent->g_string &&
-				( !strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) ||
+				( !strncasecmp(sip->sip_user_agent->g_string, "Poly", 4) ||
 				  !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20) ||
 				  !strncasecmp(sip->sip_user_agent->g_string, "ADTRAN_Total_Access", 19) )) {
 				if (sip->sip_via) {

src/switch_ivr_play_say.c

@@ -1355,6 +1355,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 
 
 	for (cur = 0; switch_channel_ready(channel) && !done && cur < argc; cur++) {
+		const int sp_fadeLen = 32;
+		const int sp_cut_src_rng = 64;
+		int16_t sp_ovrlap[32];
+		int sp_has_overlap = 0;
+		int sp_prev_idx = 0;
+		int sp_prev_cap = 0;
+		int16_t *sp_prev = NULL;
+
 		file = argv[cur];
 		eof = 0;
 
@@ -1854,42 +1862,91 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 
 			if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->speed && do_speed) {
 				float factor = 0.25f * abs(fh->speed);
-				switch_size_t newlen, supplement, step;
+				int16_t* bp = write_frame.data;
-				short *bp = write_frame.data;
+				switch_size_t supplement = (int) (factor * olen);
-				switch_size_t wrote = 0;
+				switch_size_t newlen = (fh->speed > 0) ? olen - supplement : olen + supplement;
+				int src_rng = (fh->speed > 0 ? supplement : sp_cut_src_rng)* sp_has_overlap;
+				int datalen = newlen + src_rng + sp_fadeLen;
+				int extra = datalen - olen;
+				int16_t data[datalen * 2];
+				int16_t* currp = NULL;
+				int best_cut_idx = 0;
 
-				supplement = (int) (factor * olen);
+				memset(data, 0, sizeof(data));
-				if (!supplement) {
+
-					supplement = 1;
+				if (!sp_prev) {
+					sp_prev_cap = olen * 3 + sp_prev_idx;
+					switch_zmalloc(sp_prev, sp_prev_cap);
 				}
-				newlen = (fh->speed > 0) ? olen - supplement : olen + supplement;
-
-				step = (fh->speed > 0) ? (newlen / supplement) : (olen / supplement);
 
 				if (!fh->sp_audio_buffer) {
 					switch_buffer_create_dynamic(&fh->sp_audio_buffer, 1024, 1024, 0);
 				}
 
-				while ((wrote + step) < newlen) {
+				if (extra > 0) {
-					switch_buffer_write(fh->sp_audio_buffer, bp, step * 2);
+					int cont = 0;
-					wrote += step;
+					currp = data;
-					bp += step;
+
-					if (fh->speed > 0) {
+					if (extra > sp_prev_idx) {
-						bp++;
+						// not enough data
+						switch_buffer_write(fh->sp_audio_buffer, bp, newlen * 2);
+						cont = 1;
 					} else {
-						float f;
+						memcpy(currp, sp_prev + sp_prev_idx - extra, extra * 2);
-						short s;
+						memcpy(currp + extra, bp, olen * 2);
-						f = (float) (*bp + *(bp + 1) + *(bp - 1));
+					}
-						f /= 3;
+
-						s = (short) f;
+					if (olen * 3 + sp_prev_idx > sp_prev_cap) {
-						switch_buffer_write(fh->sp_audio_buffer, &s, 2);
+						sp_prev_cap = olen * 3 + sp_prev_idx;
-						wrote++;
+						sp_prev = realloc(sp_prev, sp_prev_cap);
+						sp_prev_idx = 0;
+					}
+
+					if (sp_prev_idx > olen) {
+						memmove(sp_prev, sp_prev + sp_prev_idx - olen, olen * 2);
+						sp_prev_idx = olen;
+					}
+
+					memcpy(sp_prev + sp_prev_idx, bp, olen * 2);
+					sp_prev_idx += olen;
+
+					if (cont) {
+						continue;
+					}
+				} else {
+					sp_prev_idx = 0;
+					currp = bp;
+				}
+
+				if (sp_has_overlap) {
+					double best = INT_MIN;
+					for (int idx_src = 0; idx_src < src_rng; idx_src++) {
+						double cc = 0;
+						for (int i = 0; i < sp_fadeLen; i++) {
+							cc += sp_ovrlap[i] * (*(currp + idx_src + i));
+						}
+						if (cc > best) {
+							best = cc;
+							best_cut_idx = idx_src;
 						}
 					}
-				if (wrote < newlen) {
-					switch_size_t r = newlen - wrote;
-					switch_buffer_write(fh->sp_audio_buffer, bp, r * 2);
 				}
+
+				currp += best_cut_idx;
+				switch_buffer_write(fh->sp_audio_buffer, currp, newlen * 2);
+				currp += newlen;
+
+				if (sp_has_overlap) {
+					int16_t* ret = (int16_t*)((unsigned char*)switch_buffer_get_head_pointer(fh->sp_audio_buffer) + switch_buffer_inuse(fh->sp_audio_buffer) - 2 * newlen);
+					// crossfade
+					for (int i = 0; i < (newlen < sp_fadeLen ? newlen : sp_fadeLen); i++) {
+						double factor = ((double)i) / sp_fadeLen;
+						*(ret + i) = (int16_t)(sp_ovrlap[i] * (1 - factor) + *(ret + i) * factor);
+					}
+				}
+
+				memcpy(sp_ovrlap, currp, sp_fadeLen * 2);
+				sp_has_overlap = 1;
 				last_speed = fh->speed;
 				continue;
 			}
@@ -2051,6 +2108,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 		if (fh->sp_audio_buffer) {
 			switch_buffer_destroy(&fh->sp_audio_buffer);
 		}
+
+		switch_safe_free(sp_prev);
+
 	}
 
 	if (switch_core_codec_ready((&codec))) {