Merge bc6842a950 into 5cb74797fe

New function, `void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)` has been added to mod_pgsql module. This function is now called at several points where an error occurred but *err was not yet set.

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,6 +106,22 @@ char * pgsql_handle_get_error(switch_pgsql_handle_t *handle)
 	return err_str;
 }
 
+void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)
+{
+	char *err_str;
+
+	if (err && !(*err)) {
+		err_str = pgsql_handle_get_error(handle);
+
+		if (zstr(err_str)) {
+			switch_safe_free(err_str);
+			err_str = strdup((char *)"SQL ERROR!");
+		}
+
+		*err = err_str;
+	}
+}
+
 static int db_is_up(switch_pgsql_handle_t *handle)
 {
 	int ret = 0;
@@ -553,8 +569,15 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	return pgsql_finish_results(handle);
+	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		goto error;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+
 error:
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -630,6 +653,7 @@ done:
 
 	pgsql_free_result(&result);
 	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		pgsql_handle_set_error_if_not_set(handle, err);
 		sstatus = SWITCH_STATUS_FALSE;
 	}
 
@@ -638,6 +662,7 @@ done:
 error:
 
 	pgsql_free_result(&result);
+	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1050,6 +1075,8 @@ switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char
 	return SWITCH_STATUS_SUCCESS;
 error:
 
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 

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;
-				short *bp = write_frame.data;
-				switch_size_t wrote = 0;
+				int16_t* bp = write_frame.data;
+				switch_size_t supplement = (int) (factor * olen);
+				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);
-				if (!supplement) {
-					supplement = 1;
+				memset(data, 0, sizeof(data));
+
+				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) {
-					switch_buffer_write(fh->sp_audio_buffer, bp, step * 2);
-					wrote += step;
-					bp += step;
-					if (fh->speed > 0) {
-						bp++;
+				if (extra > 0) {
+					int cont = 0;
+					currp = data;
+
+					if (extra > sp_prev_idx) {
+						// not enough data
+						switch_buffer_write(fh->sp_audio_buffer, bp, newlen * 2);
+						cont = 1;
 					} else {
-						float f;
-						short s;
-						f = (float) (*bp + *(bp + 1) + *(bp - 1));
-						f /= 3;
-						s = (short) f;
-						switch_buffer_write(fh->sp_audio_buffer, &s, 2);
-						wrote++;
+						memcpy(currp, sp_prev + sp_prev_idx - extra, extra * 2);
+						memcpy(currp + extra, bp, olen * 2);
+					}
+
+					if (olen * 3 + sp_prev_idx > sp_prev_cap) {
+						sp_prev_cap = olen * 3 + sp_prev_idx;
+						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))) {