- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7445 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 31 Jan '08

31 Jan '08

Author: anthm Date: Thu Jan 31 11:19:45 2008 New Revision: 7445 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: refactor to suport unreasonable combinations of sample rates 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 Thu Jan 31 11:19:45 2008 @@ -254,6 +254,7 @@ uint8_t *frame; uint8_t *mux_frame; uint32_t buflen; + uint32_t framelen; uint32_t read; uint32_t len; int32_t energy_level; @@ -262,6 +263,8 @@ uint32_t native_rate; switch_audio_resampler_t *mux_resampler; switch_audio_resampler_t *read_resampler; + int16_t *resample_out; + uint32_t resample_out_len; conference_file_node_t *fnode; conference_relationship_t *relationships; switch_ivr_digit_stream_t *digit_stream; @@ -760,52 +763,43 @@ /* Read one frame of audio from each member channel and save it for redistribution */ for (imember = conference->members; imember; imember = imember->next) { + uint32_t buf_read = 0; total++; - if (imember->buflen) { - memset(imember->frame, 255, imember->buflen); - } else { - imember->frame = switch_core_alloc(imember->pool, bytes); - imember->mux_frame = switch_core_alloc(imember->pool, bytes); - imember->buflen = bytes; - } - switch_clear_flag(imember, MFLAG_HAS_AUDIO); + imember->read = 0; + + switch_clear_flag_locked(imember, MFLAG_HAS_AUDIO); switch_mutex_lock(imember->audio_in_mutex); - /* if there is audio in the resample buffer it takes precedence over the other data */ - if (imember->mux_resampler && switch_buffer_inuse(imember->resample_buffer) >= bytes) { - imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); - switch_set_flag(imember, MFLAG_HAS_AUDIO); - ready++; - } else if ((imember->read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, imember->buflen))) { + if ((buf_read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, imember->framelen))) { /* 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[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); - imember->mux_resampler->to_len = - switch_resample_process(imember->mux_resampler, imember->mux_resampler->from, - imember->mux_resampler->from_len, imember->mux_resampler->to, imember->mux_resampler->to_size, 0); - 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; - } + imember->mux_resampler->from_len = switch_short_to_float(bptr, imember->mux_resampler->from, (int) buf_read / 2); + imember->mux_resampler->to_len = switch_resample_process(imember->mux_resampler, + imember->mux_resampler->from, + imember->mux_resampler->from_len, + imember->mux_resampler->to, + imember->mux_resampler->to_size, 0); - 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); + + switch_float_to_short(imember->mux_resampler->to, imember->resample_out, imember->mux_resampler->to_len); + switch_buffer_write(imember->resample_buffer, imember->resample_out, imember->mux_resampler->to_len * 2); + + + if ((imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, imember->buflen))) { switch_set_flag(imember, MFLAG_HAS_AUDIO); - ready++; - } + ready++; + } + } else { - switch_set_flag(imember, MFLAG_HAS_AUDIO); - ready++; /* Tally of how many channels had data */ + imember->read = buf_read; + switch_set_flag_locked(imember, MFLAG_HAS_AUDIO); + ready++; } } switch_mutex_unlock(imember->audio_in_mutex); } + /* If a file or speech event is being played */ if (conference->fnode) { /* Lead in time */ @@ -4109,9 +4103,17 @@ read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) { + uint32_t buflen = switch_bytes_per_frame(conference->rate, conference->interval) * 2; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + + member.frame = switch_core_alloc(member.pool, buflen); + member.mux_frame = switch_core_alloc(member.pool, buflen); + member.buflen = buflen; + member.framelen = member.read_codec.implementation->bytes_per_frame * + conference->interval / (read_codec->implementation->microseconds_per_frame / 1000); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); @@ -4119,20 +4121,27 @@ goto done; } + + if (read_codec->implementation->actual_samples_per_second != conference->rate) { switch_audio_resampler_t **resampler = read_codec->implementation->actual_samples_per_second > conference->rate ? &member.read_resampler : &member.mux_resampler; if (switch_resample_create(resampler, read_codec->implementation->actual_samples_per_second, - read_codec->implementation->actual_samples_per_second * 20, + read_codec->implementation->actual_samples_per_second * 10, conference->rate, - conference->rate * 20, + conference->rate * 10, member.pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); goto done; } + if (member.mux_resampler) { + member.resample_out = switch_core_alloc(member.pool, conference->rate * 10); + member.resample_out_len = conference->rate * 10; + } + /* Setup an audio buffer for the resampled audio */ if (switch_buffer_create_dynamic(&member.resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX)

1 0

[commit] r7444 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 31 Jan '08

31 Jan '08

Author: anthm Date: Thu Jan 31 11:19:09 2008 New Revision: 7444 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix race on shutdown Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jan 31 11:19:09 2008 @@ -414,8 +414,11 @@ char *rpid = switch_event_get_header(event, "rpid"); char *type = switch_event_get_header(event, "event_subtype"); char *sql; - - + + if (globals.running != 1) { + return; + } + if (!proto) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Missing 'proto' header\n"); return; @@ -557,6 +560,9 @@ void *val; char *sql; + if (globals.running != 1) { + return; + } if (status && !strcasecmp(status, "n/a")) { status = NULL;

1 0

[commit] r7443 - in freeswitch/trunk/conf: . sip_profiles
by Freeswitch SVN 31 Jan '08

31 Jan '08

Author: brian Date: Wed Jan 30 22:44:24 2008 New Revision: 7443 Modified: freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml freeswitch/trunk/conf/vars.xml Log: limit outbound profile codecs to their own var. Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Wed Jan 30 22:44:24 2008 @@ -12,7 +12,7 @@ <param name="dialplan" value="XML"/> <param name="context" value="public"/> <param name="dtmf-duration" value="100"/> - <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="codec-prefs" value="$${outbound_codec_prefs}"/> <param name="use-rtp-timer" value="true"/> <param name="hold-music" value="$${moh_uri}"/> <param name="rtp-timer-name" value="soft"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Wed Jan 30 22:44:24 2008 @@ -17,7 +17,7 @@ <param name="dialplan" value="XML"/> <param name="context" value="public"/> <param name="dtmf-duration" value="100"/> - <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="codec-prefs" value="$${outbound_codec_prefs}"/> <param name="hold-music" value="$${moh_uri}"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Jan 30 22:44:24 2008 @@ -17,6 +17,7 @@ used by: dingaling.conf.xml enum.conf.xml --> <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU@20i,PCMA@20i"/> + <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU@20i,PCMA@20i"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/> <!-- bind_server_ip

1 0

[commit] r7442 - freeswitch/trunk/libs/curl/lib
by Freeswitch SVN 31 Jan '08

31 Jan '08

Author: mikej Date: Wed Jan 30 21:07:05 2008 New Revision: 7442 Modified: freeswitch/trunk/libs/curl/lib/url.c freeswitch/trunk/libs/curl/lib/url.h Log: a bit safer free. Modified: freeswitch/trunk/libs/curl/lib/url.c ============================================================================== --- freeswitch/trunk/libs/curl/lib/url.c (original) +++ freeswitch/trunk/libs/curl/lib/url.c Wed Jan 30 21:07:05 2008 @@ -200,7 +200,7 @@ #endif /* WIN32 */ #endif /* USE_ARES */ -void Curl_safefree(void *ptr) +void Curl_safefree_x(void *ptr) { if(ptr) free(ptr); Modified: freeswitch/trunk/libs/curl/lib/url.h ============================================================================== --- freeswitch/trunk/libs/curl/lib/url.h (original) +++ freeswitch/trunk/libs/curl/lib/url.h Wed Jan 30 21:07:05 2008 @@ -44,7 +44,8 @@ CURLcode Curl_protocol_connect(struct connectdata *conn, bool *done); CURLcode Curl_protocol_connecting(struct connectdata *conn, bool *done); CURLcode Curl_protocol_doing(struct connectdata *conn, bool *done); -void Curl_safefree(void *ptr); +void Curl_safefree_x(void *ptr); +#define Curl_safefree(ptr) Curl_safefree_x(ptr), ptr = NULL /* create a connection cache */ struct conncache *Curl_mk_connc(int type);

1 0

[commit] r7441 - freeswitch/trunk/scripts/contrib/evildeshi
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: brian Date: Wed Jan 30 14:58:12 2008 New Revision: 7441 Added: freeswitch/trunk/scripts/contrib/evildeshi/ Log: add evildeshi

1 0

[commit] r7439 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: anthm Date: Wed Jan 30 12:49:42 2008 New Revision: 7439 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: zoom 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 12:49:42 2008 @@ -1529,12 +1529,11 @@ switch_timer_t timer = { 0 }; switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session); uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; - uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); + uint32_t csamples = samples; uint32_t tsamples = member->orig_read_codec->implementation->samples_per_frame; uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL; - uint32_t file_intervals = member->conference->interval / (member->orig_read_codec->implementation->microseconds_per_frame / 1000); switch_assert(member->conference != NULL); @@ -1594,12 +1593,12 @@ && switch_channel_ready(channel)) { char dtmf[128] = ""; uint8_t file_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }; - switch_size_t file_data_len = csamples * 2; - switch_size_t file_sample_len = csamples; char *digit; switch_event_t *event; caller_control_action_t *caller_action = NULL; int use_timer = 0; + switch_size_t file_sample_len = csamples; + switch_size_t file_data_len = file_sample_len * 2; switch_mutex_lock(member->flag_mutex); @@ -1711,7 +1710,6 @@ if (file_sample_len <= 0) { member->fnode->done++; } else { /* there is file node data to deliver */ - int ic; write_frame.data = file_frame; write_frame.datalen = (uint32_t) file_data_len; write_frame.samples = (uint32_t) file_sample_len; @@ -1721,9 +1719,8 @@ } write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); - for (ic = 0; ic < file_intervals; ic++) { - switch_core_timer_next(&timer); - } + switch_core_timer_next(&timer); + /* forget the conference data we played file node data instead */ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);

1 0

[commit] r7438 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: anthm Date: Wed Jan 30 12:23:36 2008 New Revision: 7438 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: zag 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 12:23:36 2008 @@ -133,7 +133,8 @@ MFLAG_INTREE = (1 << 6), MFLAG_WASTE_BANDWIDTH = (1 << 7), MFLAG_FLUSH_BUFFER = (1 << 8), - MFLAG_ENDCONF = (1 << 9) + MFLAG_ENDCONF = (1 << 9), + MFLAG_HAS_AUDIO = (1 << 10) } member_flag_t; typedef enum { @@ -222,6 +223,8 @@ uint8_t min; switch_speech_handle_t lsh; switch_speech_handle_t *sh; + switch_byte_t *not_talking_buf; + uint32_t not_talking_buf_len; } conference_obj_t; /* Relationship with another member */ @@ -715,12 +718,12 @@ conference_member_t *imember, *omember; uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); uint32_t bytes = samples * 2; - uint8_t ready = 0; + uint8_t ready = 0, total = 0; switch_timer_t timer = { 0 }; switch_event_t *event; uint8_t *file_frame; uint8_t *async_file_frame; - + file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); @@ -753,10 +756,11 @@ break; } switch_mutex_lock(conference->mutex); - ready = 0; + ready = total = 0; /* Read one frame of audio from each member channel and save it for redistribution */ for (imember = conference->members; imember; imember = imember->next) { + total++; if (imember->buflen) { memset(imember->frame, 255, imember->buflen); } else { @@ -764,11 +768,12 @@ imember->mux_frame = switch_core_alloc(imember->pool, bytes); imember->buflen = bytes; } - + switch_clear_flag(imember, MFLAG_HAS_AUDIO); switch_mutex_lock(imember->audio_in_mutex); /* if there is audio in the resample buffer it takes precedence over the other data */ if (imember->mux_resampler && switch_buffer_inuse(imember->resample_buffer) >= bytes) { imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); + switch_set_flag(imember, MFLAG_HAS_AUDIO); ready++; } else if ((imember->read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, imember->buflen))) { /* If the caller is not at the right sample rate resample him to suit and buffer accordingly */ @@ -791,9 +796,11 @@ 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); + switch_set_flag(imember, MFLAG_HAS_AUDIO); ready++; } } else { + switch_set_flag(imember, MFLAG_HAS_AUDIO); ready++; /* Tally of how many channels had data */ } } @@ -861,6 +868,7 @@ } if (ready) { + int nt = 0; /* Build a muxed frame for every member that contains the mixed audio of everyone else */ for (omember = conference->members; omember; omember = omember->next) { omember->len = bytes; @@ -901,6 +909,12 @@ } } } + + if (nt && conference->not_talking_buf_len && !switch_test_flag(omember, MFLAG_HAS_AUDIO)) { + memcpy(omember->mux_frame, conference->not_talking_buf, conference->not_talking_buf_len); + continue; + } + if (imember->read > imember->len) { imember->len = imember->read; @@ -915,8 +929,15 @@ switch_normalize_to_16bit(z); muxed[x] = (int16_t) z; } - - ready++; + + if (total - ready > 1) { + conference->not_talking_buf_len = imember->read; + if (!conference->not_talking_buf) { + conference->not_talking_buf = switch_core_alloc(conference->pool, imember->read + 128); + } + memcpy(conference->not_talking_buf, muxed, conference->not_talking_buf_len); + nt++; + } } } }

1 0

[commit] r7437 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: anthm Date: Wed Jan 30 12:23:17 2008 New Revision: 7437 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: zig 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 12:23:17 2008 @@ -1513,7 +1513,8 @@ uint32_t tsamples = member->orig_read_codec->implementation->samples_per_frame; uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL; - + uint32_t file_intervals = member->conference->interval / (member->orig_read_codec->implementation->microseconds_per_frame / 1000); + switch_assert(member->conference != NULL); if (switch_core_timer_init(& timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) { @@ -1689,6 +1690,7 @@ if (file_sample_len <= 0) { member->fnode->done++; } else { /* there is file node data to deliver */ + int ic; write_frame.data = file_frame; write_frame.datalen = (uint32_t) file_data_len; write_frame.samples = (uint32_t) file_sample_len; @@ -1698,8 +1700,10 @@ } write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); - switch_core_timer_next(&timer); - + for (ic = 0; ic < file_intervals; ic++) { + switch_core_timer_next(&timer); + } + /* forget the conference data we played file node data instead */ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); }

1 0

[commit] r7436 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: brian Date: Wed Jan 30 10:59:11 2008 New Revision: 7436 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: one more tweak 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:59:11 2008 @@ -4488,7 +4488,10 @@ } if (!strcasecmp(var, "rate") && !switch_strlen_zero(val)) { - rate_name = val; + uint32_t tmp = atoi(val); + if (tmp == 8000 || tmp == 16000 || tmp == 32000) { + rate_name = val; + } } else if (!strcasecmp(var, "domain") && !switch_strlen_zero(val)) { domain = val; } else if (!strcasecmp(var, "interval") && !switch_strlen_zero(val)) {

1 0

[commit] r7435 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

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;

1 0