diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h index 272eeb1ce1..0884bbe7eb 100644 --- a/src/include/switch_channel.h +++ b/src/include/switch_channel.h @@ -245,7 +245,7 @@ SWITCH_DECLARE(const switch_state_handler_table *) switch_channel_get_state_hand /*! \brief Set private data on channel \param channel channel on which to set data - \param private void pointer to private data + \param private_info void pointer to private data \return SWITCH_STATUS_SUCCESS if data was set */ SWITCH_DECLARE(switch_status) switch_channel_set_private(switch_channel *channel, void *private_info); diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h index e71379a836..cf602edd75 100644 --- a/src/include/switch_ivr.h +++ b/src/include/switch_ivr.h @@ -73,6 +73,8 @@ SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_callback(switch_core_ses \param maxdigits max number of digits to read \param terminators digits to end the collection \param terminator actual digit that caused the collection to end (if any) + \param timeout timeout in ms + \param poll_channel flag to specify if you want the function to poll the channel while running \return SWITCH_STATUS_SUCCESS to keep the collection moving. */ SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_count(switch_core_session *session, @@ -87,7 +89,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_collect_digits_count(switch_core_sessio /*! \brief play a file from the disk to the session \param session the session to play the file too - \param pointer to file handle to use (NULL for builtin one) + \param fh file handle to use (NULL for builtin one) \param file the path to the file \param timer_name the name of a timer to use input will be absorbed (NULL to time off the session input). \param dtmf_callback code to execute if any dtmf is dialed during the playback @@ -109,6 +111,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_play_file(switch_core_session *session, /*! \brief record a file from the session to a file \param session the session to record from + \param fh file handle to use \param file the path to the file \param dtmf_callback code to execute if any dtmf is dialed during the recording \param buf an object to maintain across calls @@ -127,6 +130,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_record_file(switch_core_session *sessio /*! \brief Speak given text with given tts engine \param session the session to speak on + \param tts_name the desired tts module \param voice_name the desired voice \param timer_name optional timer to use for async behaviour \param rate the sample rate diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.c b/src/mod/codecs/mod_ilbc/mod_ilbc.c index 43c4723e1c..35057358fa 100644 --- a/src/mod/codecs/mod_ilbc/mod_ilbc.c +++ b/src/mod/codecs/mod_ilbc/mod_ilbc.c @@ -36,8 +36,8 @@ static const char modname[] = "mod_ilbc"; struct ilbc_context { - ilbc encoder; - ilbc decoder; + iLBC_Enc_Inst_t encoder; + iLBC_Dec_Inst_t decoder; }; static switch_status switch_ilbc_init(switch_codec *codec, switch_codec_flag flags, @@ -54,9 +54,9 @@ static switch_status switch_ilbc_init(switch_codec *codec, switch_codec_flag fla } else { context = switch_core_alloc(codec->memory_pool, sizeof(*context)); if (encoding) - context->encoder = ilbc_create(); + initEncode(&context->encoder, 30); if (decoding) - context->decoder = ilbc_create(); + initDecode(&context->decoder, 30, 0); } codec->private_info = context; @@ -66,16 +66,6 @@ static switch_status switch_ilbc_init(switch_codec *codec, switch_codec_flag fla static switch_status switch_ilbc_destroy(switch_codec *codec) { - struct ilbc_context *context = codec->private_info; - - int encoding = (codec->flags & SWITCH_CODEC_FLAG_ENCODE); - int decoding = (codec->flags & SWITCH_CODEC_FLAG_DECODE); - - if (encoding) - ilbc_destroy(context->encoder); - if (decoding) - ilbc_destroy(context->decoder); - codec->private_info = NULL; return SWITCH_STATUS_SUCCESS; } @@ -105,7 +95,7 @@ static switch_status switch_ilbc_encode(switch_codec *codec, int x; int loops = (int) decoded_data_len / 320; for (x = 0; x < loops && new_len < *encoded_data_len; x++) { - ilbc_encode(context->encoder, ddp, edp); + iLBC_encode(context->encoder, ddp, edp); edp += 33; ddp += 160; new_len += 33; @@ -146,7 +136,7 @@ static switch_status switch_ilbc_decode(switch_codec *codec, unsigned int new_len = 0; for (x = 0; x < loops && new_len < *decoded_data_len; x++) { - ilbc_decode(context->decoder, edp, ddp); + iLBC_decode(context->decoder, edp, ddp); ddp += 160; edp += 33; new_len += 320; diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj index f59cb1a393..2942d042b2 100644 --- a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj +++ b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="mod_ilbc" - ProjectGUID="{4926323F-4EA8-4B7D-A3D3-65488725988F}" + ProjectGUID="{D3EC0AFF-76FC-4210-A825-9A17410660A3}" RootNamespace="mod_ilbc" Keyword="Win32Proj" > @@ -42,7 +42,7 @@