[Freeswitch-svn] [commit] r7435 - in freeswitch/trunk/src: . mod/applications/mod_conference

[Freeswitch SVN]

Author: brian
Date: Wed Jan 30 10:45:52 2008
New Revision: 7435

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/switch_core_file.c
   freeswitch/trunk/src/switch_core_io.c
   freeswitch/trunk/src/switch_resample.c

Log:
small tweak to resampler

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Wed Jan 30 10:45:52 2008
@@ -774,7 +774,7 @@
 				/* If the caller is not at the right sample rate resample him to suit and buffer accordingly */
 				if (imember->mux_resampler) {
 					int16_t *bptr = (int16_t *) imember->frame;
-					int16_t out[1024];
+					int16_t out[SWITCH_RECOMMENDED_BUFFER_SIZE];
 					int len = (int) imember->read;
 
 					imember->mux_resampler->from_len = switch_short_to_float(bptr, imember->mux_resampler->from, (int) len / 2);
@@ -784,6 +784,10 @@
 					switch_float_to_short(imember->mux_resampler->to, out, len);
 					len = imember->mux_resampler->to_len * 2;
 					
+                    if (len > SWITCH_RECOMMENDED_BUFFER_SIZE) {
+                        len = SWITCH_RECOMMENDED_BUFFER_SIZE;
+                    }
+
 					switch_buffer_write(imember->resample_buffer, out, len);
 					if (switch_buffer_inuse(imember->resample_buffer) >= bytes) {
 						imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes);

Modified: freeswitch/trunk/src/switch_core_file.c
==============================================================================
--- freeswitch/trunk/src/switch_core_file.c	(original)
+++ freeswitch/trunk/src/switch_core_file.c	Wed Jan 30 10:45:52 2008
@@ -143,9 +143,9 @@
 		if (!fh->resampler) {
 			if (switch_resample_create(&fh->resampler,
 									   fh->native_rate,
-									   orig_len * 10,
+									   orig_len,
 									   fh->samplerate,
-									   (uint32_t)orig_len * 10,
+									   (uint32_t)orig_len,
 									   fh->memory_pool) != SWITCH_STATUS_SUCCESS) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n");
 				return SWITCH_STATUS_GENERR;
@@ -197,9 +197,9 @@
 		if (!fh->resampler) {
 			if (switch_resample_create(&fh->resampler,
 									   fh->native_rate,
-									   orig_len * 10,
+									   orig_len,
 									   fh->samplerate,
-									   (uint32_t)orig_len * 10,
+									   (uint32_t)orig_len,
 									   fh->memory_pool) != SWITCH_STATUS_SUCCESS) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n");
 				return SWITCH_STATUS_GENERR;

Modified: freeswitch/trunk/src/switch_core_io.c
==============================================================================
--- freeswitch/trunk/src/switch_core_io.c	(original)
+++ freeswitch/trunk/src/switch_core_io.c	Wed Jan 30 10:45:52 2008
@@ -192,9 +192,9 @@
 					switch_mutex_lock(session->resample_mutex);
 					status = switch_resample_create(&session->read_resampler,
 													read_frame->codec->implementation->actual_samples_per_second,
-													read_frame->codec->implementation->bytes_per_frame * 20,
+													read_frame->codec->implementation->bytes_per_frame,
 													session->read_codec->implementation->actual_samples_per_second,
-													session->read_codec->implementation->bytes_per_frame * 20, session->pool);
+													session->read_codec->implementation->bytes_per_frame, session->pool);
 					switch_mutex_unlock(session->resample_mutex);
 					
 					if (status != SWITCH_STATUS_SUCCESS) {
@@ -520,9 +520,9 @@
 					switch_mutex_lock(session->resample_mutex);
 					status = switch_resample_create(&session->write_resampler,
 													frame->codec->implementation->actual_samples_per_second,
-													frame->codec->implementation->bytes_per_frame * 20,
+													frame->codec->implementation->bytes_per_frame,
 													session->write_codec->implementation->actual_samples_per_second,
-													session->write_codec->implementation->bytes_per_frame * 20, session->pool);
+													session->write_codec->implementation->bytes_per_frame, session->pool);
 					switch_mutex_unlock(session->resample_mutex);
 					if (status != SWITCH_STATUS_SUCCESS) {
 						goto done;
@@ -753,9 +753,9 @@
 									switch_mutex_lock(session->resample_mutex);
 									status = switch_resample_create(&session->read_resampler,
 																	frame->codec->implementation->actual_samples_per_second,
-																	frame->codec->implementation->bytes_per_frame * 20,
+																	frame->codec->implementation->bytes_per_frame,
 																	session->write_codec->implementation->actual_samples_per_second,
-																	session->write_codec->implementation->bytes_per_frame * 20, session->pool);
+																	session->write_codec->implementation->bytes_per_frame, session->pool);
 									switch_mutex_unlock(session->resample_mutex);
 									
 									if (status != SWITCH_STATUS_SUCCESS) {

Modified: freeswitch/trunk/src/switch_resample.c
==============================================================================
--- freeswitch/trunk/src/switch_resample.c	(original)
+++ freeswitch/trunk/src/switch_resample.c	Wed Jan 30 10:45:52 2008
@@ -51,6 +51,8 @@
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
+#define resample_buffer(a, b, c) a > b ? ((a / 1000) / 2) * c : ((b / 1000) / 2) * c
+
 SWITCH_DECLARE(switch_status_t) switch_resample_create(switch_audio_resampler_t **new_resampler,
 													   int from_rate, switch_size_t from_size, int to_rate, uint32_t to_size, switch_memory_pool_t *pool)
 {
@@ -74,9 +76,9 @@
 	resampler->resampler = resample_open(QUALITY, resampler->factor, resampler->factor);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Activate Resampler %d->%d %f\n", resampler->from_rate, resampler->to_rate,
 					  resampler->factor);
-	resampler->from_size = from_size;
+	resampler->from_size = resample_buffer(to_rate, from_rate, (uint32_t)from_size);
 	resampler->from = (float *) switch_core_alloc(pool, resampler->from_size);
-	resampler->to_size = to_size;
+	resampler->to_size = resample_buffer(to_rate, from_rate, (uint32_t)to_size); ;
 	resampler->to = (float *) switch_core_alloc(pool, resampler->to_size);
 
 	*new_resampler = resampler;