Author: anthm Date: Wed Feb 18 07:54:17 2009 New Revision: 12136 Log: revert Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_core_speech.c Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Wed Feb 18 07:54:17 2009 @@ -420,16 +420,6 @@ char *param; /*! the handle's memory pool */ switch_memory_pool_t *memory_pool; - switch_audio_resampler_t *resampler; - switch_buffer_t *buffer; - switch_byte_t *dbuf; - switch_size_t dbuflen; - /*! the current samplerate */ - uint32_t samplerate; - /*! the current native samplerate */ - uint32_t native_rate; - /*! the number of channels */ - /*! private data for the format module to store handle specific info */ void *private_info; }; Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Wed Feb 18 07:54:17 2009 @@ -80,7 +80,7 @@ sh->rate = rate; sh->name = switch_core_strdup(pool, module_name); sh->samples = switch_samples_per_packet(rate, interval); - sh->native_rate = rate; + return sh->speech_interface->speech_open(sh, voice_name, rate, flags); } @@ -130,56 +130,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, uint32_t *rate, switch_speech_flag_t *flags) { - switch_status_t status; - switch_size_t want, orig_len = *datalen; - switch_assert(sh != NULL); - - want = *datalen; - - more: - - status = sh->speech_interface->speech_read_tts(sh, data, datalen, rate, flags); - - if (sh->native_rate && sh->samplerate && sh->native_rate != sh->samplerate) { - if (!sh->resampler) { - if (switch_resample_create(&sh->resampler, - sh->native_rate, sh->samplerate, (uint32_t) orig_len, SWITCH_RESAMPLE_QUALITY) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); - return SWITCH_STATUS_GENERR; - } - } - - switch_resample_process(sh->resampler, data, *datalen); - - if (sh->resampler->to_len < want || sh->resampler->to_len > orig_len) { - if (!sh->buffer) { - int factor = sh->resampler->to_len * sh->samplerate / 1000; - switch_buffer_create_dynamic(&sh->buffer, factor, factor, 0); - switch_assert(sh->buffer); - } - if (!sh->dbuf || sh->dbuflen < sh->resampler->to_len * 2) { - sh->dbuflen = sh->resampler->to_len * 2; - sh->dbuf = switch_core_alloc(sh->memory_pool, sh->dbuflen); - } - switch_assert(sh->resampler->to_len <= sh->dbuflen); - - memcpy((int16_t *) sh->dbuf, sh->resampler->to, sh->resampler->to_len * 2); - switch_buffer_write(sh->buffer, sh->dbuf, sh->resampler->to_len * 2); - - if (switch_buffer_inuse(sh->buffer) < want * 2) { - *datalen = want; - goto more; - } - *datalen = switch_buffer_read(sh->buffer, data, orig_len * 2) / 2; - } else { - memcpy(data, sh->resampler->to, sh->resampler->to_len * 2); - *datalen = sh->resampler->to_len; - } - } - - return *datalen ? SWITCH_STATUS_SUCCESS : status; + return sh->speech_interface->speech_read_tts(sh, data, datalen, rate, flags); } @@ -187,12 +140,6 @@ { switch_status_t status = sh->speech_interface->speech_close(sh, flags); - if (sh->buffer) { - switch_buffer_destroy(&sh->buffer); - } - - switch_resample_destroy(&sh->resampler); - UNPROTECT_INTERFACE(sh->speech_interface); if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_FREE_POOL)) {