April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12962 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 09 Apr '09

09 Apr '09

Author: anthm Date: Thu Apr 9 12:40:19 2009 New Revision: 12962 Log: delay init of resources until the first time they are actually used to avoid unnecessary waste of resources in hardware codec Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Thu Apr 9 12:40:19 2009 @@ -117,11 +117,63 @@ return fd; } +static switch_status_t init_encoder(switch_codec_t *codec) +{ + struct dahdi_transcoder_formats fmts; + struct dahdi_context *context = codec->private_info; + + fmts.srcfmt = DAHDI_FORMAT_ULAW; + fmts.dstfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; + context->encoding_fd = switch_dahdi_get_transcoder(&fmts); + if (context->decoding_fd < 0) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "encoding requested and denied with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + return SWITCH_STATUS_FALSE; + } + /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ + context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? 8 : 12; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoding requested and granted with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t init_decoder(switch_codec_t *codec) +{ + struct dahdi_transcoder_formats fmts; + struct dahdi_context *context = codec->private_info; + + fmts.dstfmt = DAHDI_FORMAT_ULAW; + fmts.srcfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; + context->decoding_fd = switch_dahdi_get_transcoder(&fmts); + if (context->decoding_fd < 0) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and denied with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and granted with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t switch_dahdi_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { uint32_t encoding, decoding; struct dahdi_context *context = NULL; - struct dahdi_transcoder_formats fmts; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI init called.\n"); encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); @@ -141,44 +193,10 @@ return SWITCH_STATUS_FALSE; } - if (encoding) { - fmts.srcfmt = DAHDI_FORMAT_ULAW; - fmts.dstfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) - ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; - context->encoding_fd = switch_dahdi_get_transcoder(&fmts); - if (context->decoding_fd < 0) { -#ifdef DEBUG_DAHDI_CODEC - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "encoding requested and denied with %d/%d.\n", - fmts.srcfmt, fmts.dstfmt); -#endif - return SWITCH_STATUS_FALSE; - } - /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ - context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) - ? 8 : 12; -#ifdef DEBUG_DAHDI_CODEC - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoding requested and granted with %d/%d.\n", - fmts.srcfmt, fmts.dstfmt); -#endif - } - if (decoding) { - fmts.dstfmt = DAHDI_FORMAT_ULAW; - fmts.srcfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) - ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; - context->decoding_fd = switch_dahdi_get_transcoder(&fmts); - if (context->decoding_fd < 0) { -#ifdef DEBUG_DAHDI_CODEC - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and denied with %d/%d.\n", - fmts.srcfmt, fmts.dstfmt); -#endif - return SWITCH_STATUS_FALSE; - } -#ifdef DEBUG_DAHDI_CODEC - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and granted with %d/%d.\n", - fmts.srcfmt, fmts.dstfmt); -#endif - } codec->private_info = context; + context->encoding_fd = -1; + context->decoding_fd = -1; + return SWITCH_STATUS_SUCCESS; } @@ -195,10 +213,19 @@ unsigned char ebuf_ulaw[decoded_data_len/2]; uint32_t i; struct dahdi_context *context = NULL; + switch_status_t status; + #ifdef DEBUG_DAHDI_CODEC switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI encode called to encode %d bytes.\n", decoded_data_len); #endif context = codec->private_info; + + if (context->encoding_fd == -1) { + if ((status = init_encoder(codec)) != SWITCH_STATUS_SUCCESS) { + return status; + } + } + dbuf_linear = decoded_data; ebuf_g729 = encoded_data; for (i = 0; i < decoded_data_len / sizeof(short); i++) { @@ -245,6 +272,8 @@ unsigned char *ebuf_g729; uint32_t i; struct dahdi_context *context; + switch_status_t status; + #ifdef DEBUG_DAHDI_CODEC switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode called to decode %d bytes.\n", encoded_data_len); #endif @@ -253,6 +282,12 @@ dbuf_linear = decoded_data; ebuf_g729 = encoded_data; + if (context->decoding_fd == -1) { + if ((status = init_decoder(codec)) != SWITCH_STATUS_SUCCESS) { + return status; + } + } + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet); *decoded_data_len = codec->implementation->decoded_bytes_per_packet;

1 0

[commit] r12961 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_esf mod/applications/mod_fax mod/applications/mod_fsv mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_loopback mod/endpoints/mod_portaudio mod/endpoints/mod_reference mod/endpoints/mod_skypiax mod/endpoints/mod_sofia mod/endpoints/mod_unicall mod/formats/mod_portaudio_stream
by FreeSWITCH SVN 09 Apr '09

09 Apr '09

Author: anthm Date: Thu Apr 9 12:17:12 2009 New Revision: 12961 Log: FSCORE-349 add flag to denote if a codec is init or not Modified: freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Thu Apr 9 12:17:12 2009 @@ -68,7 +68,6 @@ switch_bool_t m; /*! frame flags */ switch_frame_flag_t flags; - switch_core_session_t *session; }; SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Apr 9 12:17:12 2009 @@ -413,6 +413,7 @@ impl->destroy = destroy; impl->codec_id = codec_interface->codec_id; impl->next = codec_interface->implementations; + impl->impl_id = switch_core_codec_next_id(); codec_interface->implementations = impl; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Rejected codec name: %s rate: %u ptime: %u\n", @@ -427,6 +428,11 @@ } +static inline switch_bool_t switch_core_codec_ready(switch_codec_t *codec) +{ + return (codec->flags & SWITCH_CODEC_FLAG_READY) ? SWITCH_TRUE : SWITCH_FALSE; +} + 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 Thu Apr 9 12:17:12 2009 @@ -609,6 +609,7 @@ /*! deinitalize a codec handle using this implementation */ switch_core_codec_destroy_func_t destroy; uint32_t codec_id; + uint32_t impl_id; struct switch_codec_implementation *next; }; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Apr 9 12:17:12 2009 @@ -954,7 +954,8 @@ SWITCH_CODEC_FLAG_SILENCE = (1 << 4), SWITCH_CODEC_FLAG_FREE_POOL = (1 << 5), SWITCH_CODEC_FLAG_AAL2 = (1 << 6), - SWITCH_CODEC_FLAG_PASSTHROUGH = (1 << 7) + SWITCH_CODEC_FLAG_PASSTHROUGH = (1 << 7), + SWITCH_CODEC_FLAG_READY = (1 << 8) } switch_codec_flag_enum_t; typedef uint32_t switch_codec_flag_t; 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 Apr 9 12:17:12 2009 @@ -4489,7 +4489,7 @@ switch_core_session_reset(member->session, SWITCH_TRUE, SWITCH_FALSE); - if (member->read_codec.implementation) { + if (switch_core_codec_ready(&member->read_codec)) { switch_core_codec_destroy(&member->read_codec); } Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Thu Apr 9 12:17:12 2009 @@ -242,7 +242,7 @@ fail: switch_core_session_set_read_codec(session, NULL); - if (codec.implementation) { + if (switch_core_codec_ready(&codec)) { switch_core_codec_destroy(&codec); } Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Apr 9 12:17:12 2009 @@ -678,11 +678,11 @@ switch_core_session_set_read_codec(session, NULL); - if (read_codec.implementation) { + if (switch_core_codec_ready(&read_codec)) { switch_core_codec_destroy(&read_codec); } - if (write_codec.implementation) { + if (switch_core_codec_ready(&write_codec)) { switch_core_codec_destroy(&write_codec); } Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Thu Apr 9 12:17:12 2009 @@ -346,11 +346,11 @@ switch_core_session_set_read_codec(session, read_codec); } - if (codec.implementation) { + if (switch_core_codec_ready(&codec)) { switch_core_codec_destroy(&codec); } - if (vid_codec.implementation) { + if (switch_core_codec_ready(&vid_codec)) { switch_core_codec_destroy(&vid_codec); } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Thu Apr 9 12:17:12 2009 @@ -931,11 +931,11 @@ { deactivate_audio_device(); - if (globals.read_codec.implementation) { + if (switch_core_codec_ready(&globals.read_codec)) { switch_core_codec_destroy(&globals.read_codec); } - if (globals.write_codec.implementation) { + if (switch_core_codec_ready(&globals.write_codec)) { switch_core_codec_destroy(&globals.write_codec); } switch_core_hash_destroy(&globals.call_hash); 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 Apr 9 12:17:12 2009 @@ -1244,11 +1244,11 @@ tech_pvt->rtp_session = NULL; } - if (tech_pvt->read_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } @@ -1440,7 +1440,7 @@ } } - if (!tech_pvt->read_codec.implementation) { + if (!switch_core_codec_ready(&tech_pvt->read_codec) || !tech_pvt->read_codec.implementation) { return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Apr 9 12:17:12 2009 @@ -498,11 +498,11 @@ switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); switch_clear_flag_locked(tech_pvt, TFLAG_CODEC); - if (tech_pvt->read_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { + if (!switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } @@ -1084,7 +1084,8 @@ if (channel && switch_channel_up(channel)) { int bytes = 0, frames = 1; - if (!switch_test_flag(tech_pvt, TFLAG_CODEC) || !tech_pvt->read_codec.implementation) { + if (!switch_test_flag(tech_pvt, TFLAG_CODEC) || !tech_pvt->read_codec.implementation || + !switch_core_codec_ready(&tech_pvt->read_codec)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); break; } Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Thu Apr 9 12:17:12 2009 @@ -113,11 +113,11 @@ interval = codec->implementation->microseconds_per_packet / 1000; } - if (tech_pvt->read_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } @@ -133,7 +133,7 @@ NULL, switch_core_session_get_pool(session)); - if (status != SWITCH_STATUS_SUCCESS || !tech_pvt->read_codec.implementation) { + if (status != SWITCH_STATUS_SUCCESS || !tech_pvt->read_codec.implementation || !switch_core_codec_ready(&tech_pvt->read_codec)) { goto end; } @@ -373,11 +373,11 @@ switch_core_timer_destroy(&tech_pvt->timer); - if (tech_pvt->read_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Apr 9 12:17:12 2009 @@ -348,11 +348,11 @@ static void destroy_codecs(void) { - if (globals.read_codec.implementation) { + if (switch_core_codec_ready(&globals.read_codec)) { switch_core_codec_destroy(&globals.read_codec); } - if (globals.write_codec.implementation) { + if (switch_core_codec_ready(&globals.write_codec)) { switch_core_codec_destroy(&globals.write_codec); } @@ -1294,7 +1294,7 @@ return SWITCH_STATUS_SUCCESS; } - if (!globals.read_codec.implementation) { + if (!switch_core_codec_ready(&globals.read_codec))) { if (switch_core_codec_init(&globals.read_codec, "L16", NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, @@ -1306,7 +1306,7 @@ switch_assert(globals.read_codec.implementation); - if (!globals.write_codec.implementation) { + if (!switch_core_codec_ready(&globals.write_codec)) { if (switch_core_codec_init(&globals.write_codec, "L16", NULL, Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Thu Apr 9 12:17:12 2009 @@ -200,11 +200,11 @@ switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); //switch_thread_cond_signal(tech_pvt->cond); - if (tech_pvt->read_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Apr 9 12:17:12 2009 @@ -205,12 +205,12 @@ skypiax_signaling_write(tech_pvt, msg_to_skype); } - if (tech_pvt->read_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->read_codec); + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->write_codec); + if (switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); } memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str)); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Apr 9 12:17:12 2009 @@ -379,11 +379,11 @@ sofia_clear_flag(tech_pvt, TFLAG_IO); - if (tech_pvt->read_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } - if (tech_pvt->write_codec.implementation) { + if (switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } @@ -665,7 +665,8 @@ tech_pvt->read_frame.datalen = 0; sofia_set_flag_locked(tech_pvt, TFLAG_READING); - if (sofia_test_flag(tech_pvt, TFLAG_HUP) || sofia_test_flag(tech_pvt, TFLAG_BYE) || !tech_pvt->read_codec.implementation) { + if (sofia_test_flag(tech_pvt, TFLAG_HUP) || sofia_test_flag(tech_pvt, TFLAG_BYE) || !tech_pvt->read_codec.implementation || + !switch_core_codec_ready(&tech_pvt->read_codec)) { return SWITCH_STATUS_FALSE; } @@ -711,7 +712,7 @@ int frames = 1; if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { - if (!tech_pvt->read_codec.implementation) { + if (!tech_pvt->read_codec.implementation || !switch_core_codec_ready(&tech_pvt->read_codec)) { *frame = NULL; return SWITCH_STATUS_GENERR; } @@ -872,7 +873,7 @@ } } - if (!tech_pvt->read_codec.implementation) { + if (!tech_pvt->read_codec.implementation || !switch_core_codec_ready(&tech_pvt->read_codec)) { return SWITCH_STATUS_GENERR; } @@ -888,7 +889,7 @@ return SWITCH_STATUS_SUCCESS; } - if (sofia_test_flag(tech_pvt, TFLAG_BYE) || !tech_pvt->read_codec.implementation) { + if (sofia_test_flag(tech_pvt, TFLAG_BYE) || !tech_pvt->read_codec.implementation || !switch_core_codec_ready(&tech_pvt->read_codec)) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Apr 9 12:17:12 2009 @@ -1752,7 +1752,7 @@ switch_status_t sofia_glue_tech_set_video_codec(private_object_t *tech_pvt, int force) { - if (tech_pvt->video_read_codec.implementation) { + if (tech_pvt->video_read_codec.implementation && switch_core_codec_ready(&tech_pvt->video_read_codec)) { if (!force) { return SWITCH_STATUS_SUCCESS; } @@ -1825,7 +1825,7 @@ switch_goto_status(SWITCH_STATUS_FALSE, end); } - if (tech_pvt->read_codec.implementation) { + if (tech_pvt->read_codec.implementation && switch_core_codec_ready(&tech_pvt->read_codec)) { if (!force) { switch_goto_status(SWITCH_STATUS_SUCCESS, end); } @@ -1885,7 +1885,7 @@ tech_pvt->read_frame.rate = tech_pvt->rm_rate; ms = tech_pvt->write_codec.implementation->microseconds_per_packet / 1000; - if (!tech_pvt->read_codec.implementation) { + if (!switch_core_codec_ready(&tech_pvt->read_codec)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); switch_goto_status(SWITCH_STATUS_FALSE, end); } Modified: freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Thu Apr 9 12:17:12 2009 @@ -948,11 +948,11 @@ switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); //switch_thread_cond_signal(tech_pvt->cond); - if (tech_pvt->read_codec.implementation) + if (switch_core_codec_ready(&tech_pvt->read_codec)) switch_core_codec_destroy(&tech_pvt->read_codec); - if (tech_pvt->write_codec.implementation) + if (switch_core_codec_ready(&tech_pvt->write_codec) switch_core_codec_destroy(&tech_pvt->write_codec); - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s channel hangup\n", switch_channel_get_name(channel)); #if 0 Modified: freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c Thu Apr 9 12:17:12 2009 @@ -171,7 +171,7 @@ return SWITCH_STATUS_SUCCESS; } - if (!source->read_codec.implementation) { + if (!switch_core_codec_ready(&source->read_codec)) { if (switch_core_codec_init(&source->read_codec, "L16", NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, @@ -183,7 +183,7 @@ switch_assert(source->read_codec.implementation); - if (!source->write_codec.implementation) { + if (!switch_core_codec_ready(&source->write_codec) { if (switch_core_codec_init(&source->write_codec, "L16", NULL, @@ -340,11 +340,11 @@ switch_mutex_lock(source->device_lock); CloseAudioStream(source->audio_stream); - if (source->read_codec.implementation) { + if (switch_core_codec_ready(&source->read_codec)) { switch_core_codec_destroy(&source->read_codec); switch_core_codec_destroy(&source->write_codec); } - if (source->write_codec.implementation) { + if (switch_core_codec_ready(&source->write_codec) { switch_core_codec_destroy(&source->write_codec); } switch_mutex_unlock(source->device_lock); Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Apr 9 12:17:12 2009 @@ -100,7 +100,7 @@ switch_mutex_lock(session->codec_read_mutex); - if (codec && !codec->implementation) { + if (codec && (!codec->implementation || !switch_core_codec_ready(codec))) { codec = NULL; } @@ -221,7 +221,7 @@ switch_mutex_lock(session->codec_write_mutex); - if (!codec || !codec->implementation) { + if (!codec || !codec->implementation || !switch_core_codec_ready(codec)) { if (session->real_write_codec) { session->write_codec = session->real_write_codec; session->write_impl = *session->real_write_codec->implementation; @@ -301,7 +301,7 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - if (!codec || !codec->implementation) { + if (!codec || !codec->implementation || !switch_core_codec_ready(codec)) { if (session->video_read_codec) { session->video_read_codec = NULL; status = SWITCH_STATUS_SUCCESS; @@ -345,7 +345,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - if (!codec || !codec->implementation) { + if (!codec || !codec->implementation || !switch_core_codec_ready(codec)) { if (session->video_write_codec) { session->video_write_codec = NULL; status = SWITCH_STATUS_SUCCESS; @@ -493,7 +493,7 @@ implementation->init(codec, flags, codec_settings); switch_mutex_init(&codec->mutex, SWITCH_MUTEX_NESTED, codec->memory_pool); - + switch_set_flag(codec, SWITCH_CODEC_FLAG_READY); return SWITCH_STATUS_SUCCESS; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec %s Exists but not at the desired implementation. %dhz %dms\n", codec_name, rate, @@ -518,7 +518,7 @@ switch_assert(encoded_data != NULL); switch_assert(decoded_data != NULL); - if (!codec->implementation) { + if (!codec->implementation || !switch_core_codec_ready(codec)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n"); return SWITCH_STATUS_NOT_INITALIZED; } @@ -550,7 +550,7 @@ switch_assert(encoded_data != NULL); switch_assert(decoded_data != NULL); - if (!codec->implementation) { + if (!codec->implementation || !switch_core_codec_ready(codec)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n"); return SWITCH_STATUS_NOT_INITALIZED; } @@ -576,7 +576,7 @@ switch_assert(codec != NULL); - if (!codec->implementation) { + if (!codec->implementation || !switch_core_codec_ready(codec)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initialized!\n"); return SWITCH_STATUS_NOT_INITALIZED; } @@ -591,11 +591,10 @@ if (mutex) switch_mutex_lock(mutex); codec->implementation->destroy(codec); + switch_clear_flag(codec, SWITCH_CODEC_FLAG_READY); UNPROTECT_INTERFACE(codec->codec_interface); - memset(codec, 0, sizeof(*codec)); - if (mutex) switch_mutex_unlock(mutex); if (free_pool) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Apr 9 12:17:12 2009 @@ -106,10 +106,11 @@ switch_status_t status = SWITCH_STATUS_FALSE; int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; + switch_codec_implementation_t codec_impl; switch_assert(session != NULL); - if (!(session->read_codec && session->read_codec->implementation)) { + if (!(session->read_codec && session->read_codec->implementation && switch_core_codec_ready(session->read_codec))) { if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) || switch_channel_get_state(session->channel) == CS_HIBERNATE) { *frame = &runtime.dummy_cng_frame; return SWITCH_STATUS_SUCCESS; @@ -202,16 +203,21 @@ switch_assert((*frame)->codec != NULL); - if (((*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { - need_codec = TRUE; - } - - if (!(session->read_codec && (*frame)->codec && (*frame)->codec->implementation)) { + switch_mutex_lock((*frame)->codec->mutex); + if (!(session->read_codec && (*frame)->codec && (*frame)->codec->implementation) && switch_core_codec_ready((*frame)->codec)) { status = SWITCH_STATUS_FALSE; + switch_mutex_unlock((*frame)->codec->mutex); goto done; } - if ((*frame)->codec->implementation->actual_samples_per_second != session->read_impl.actual_samples_per_second) { + codec_impl = *(*frame)->codec->implementation; + switch_mutex_unlock((*frame)->codec->mutex); + + if (session->read_codec->implementation->impl_id != codec_impl.impl_id) { + need_codec = TRUE; + } + + if (codec_impl.actual_samples_per_second != session->read_impl.actual_samples_per_second) { do_resample = 1; } @@ -243,7 +249,7 @@ } else { switch_codec_t *use_codec = read_frame->codec; if (do_bugs) { - if (!session->bug_codec.implementation) { + if (!switch_core_codec_ready(&session->bug_codec)) { switch_core_codec_copy(read_frame->codec, &session->bug_codec, switch_core_session_get_pool(session)); } use_codec = &session->bug_codec; @@ -525,12 +531,10 @@ even_more_done: - if (!*frame || !(*frame)->codec || !(*frame)->codec->implementation) { + if (!*frame || !(*frame)->codec || !(*frame)->codec->implementation || !switch_core_codec_ready((*frame)->codec)) { *frame = &runtime.dummy_cng_frame; } - (*frame)->session = session; - switch_mutex_unlock(session->read_codec->mutex); switch_mutex_unlock(session->codec_read_mutex); @@ -579,7 +583,7 @@ return SWITCH_STATUS_SUCCESS; } - if (!(session->write_codec && session->write_codec->implementation) && !pass_cng) { + if (!(session->write_codec && switch_core_codec_ready(session->write_codec)) && !pass_cng) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no write codec.\n", switch_channel_get_name(session->channel)); return SWITCH_STATUS_FALSE; } @@ -924,7 +928,7 @@ - if (frame->codec && frame->codec->implementation) { + if (frame->codec && frame->codec->implementation && switch_core_codec_ready(frame->codec)) { rate = frame->codec->implementation->actual_samples_per_second; } else { rate = session->write_impl.actual_samples_per_second; Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Thu Apr 9 12:17:12 2009 @@ -334,7 +334,7 @@ status = SWITCH_STATUS_SUCCESS; } - if (session->bug_codec.implementation) { + if (switch_core_codec_ready(&session->bug_codec)) { switch_core_codec_destroy(&session->bug_codec); memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } @@ -389,7 +389,7 @@ } } - if (!session->bugs && session->bug_codec.implementation) { + if (!session->bugs && switch_core_codec_ready(&session->bug_codec)) { switch_core_codec_destroy(&session->bug_codec); memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } @@ -427,7 +427,7 @@ switch_thread_rwlock_unlock(session->bug_rwlock); } - if (!session->bugs && session->bug_codec.implementation) { + if (!session->bugs && switch_core_codec_ready(&session->bug_codec)) { switch_core_codec_destroy(&session->bug_codec); memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Apr 9 12:17:12 2009 @@ -399,11 +399,11 @@ vid_read_codec = switch_core_session_get_video_read_codec(session); - if (read_codec && read_codec->implementation) { + if (read_codec && read_codec->implementation && switch_core_codec_ready(read_codec)) { char rc[80] = "", vrc[80] = "", tmp[160] = ""; switch_codec2str(read_codec, rc, sizeof(rc)); - if (vid_read_codec && vid_read_codec->implementation) { + if (vid_read_codec && vid_read_codec->implementation && switch_core_codec_ready(vid_read_codec)) { vrc[0] = ','; switch_codec2str(read_codec, vrc+1, sizeof(vrc) - 1); switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_VIDEO_CODEC_VARIABLE, vrc+1); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Apr 9 12:17:12 2009 @@ -342,7 +342,7 @@ break; } } - if (conninfo->read_codec.implementation) { + if (switch_core_codec_ready(&conninfo->read_codec)) { switch_core_codec_destroy(&conninfo->read_codec); } switch_socket_close(conninfo->socket); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Apr 9 12:17:12 2009 @@ -833,7 +833,7 @@ switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE); - if (write_codec.implementation) { + if (switch_core_codec_ready(&write_codec)) { switch_core_codec_destroy(&write_codec); } @@ -2102,7 +2102,7 @@ switch_core_session_reset(oglobals.session, SWITCH_FALSE, SWITCH_TRUE); } - if (write_codec.implementation) { + if (switch_core_codec_ready(&write_codec)) { switch_core_codec_destroy(&write_codec); }

1 0

[commit] r12960 - in freeswitch/trunk/src: include mod/languages/mod_managed mod/languages/mod_spidermonkey_core_db mod/languages/mod_spidermonkey_curl mod/languages/mod_spidermonkey_odbc mod/languages/mod_spidermonkey_socket mod/languages/mod_spidermonkey_teletone
by FreeSWITCH SVN 09 Apr '09

09 Apr '09

Author: mikej Date: Thu Apr 9 10:28:52 2009 New Revision: 12960 Log: fix windows calling conventions for modules with sub-modules broken in svn r12919 Modified: freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/switch_platform.i freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Apr 9 10:28:52 2009 @@ -145,13 +145,16 @@ #define SWITCH_DECLARE_DATA __declspec(dllimport) #endif #if defined(SWITCH_MOD_DECLARE_STATIC) -#define SWITCH_MOD_DECLARE(type) type __cdecl +#define SWITCH_MOD_DECLARE(type) type __stdcall +#define SWITCH_MOD_DECLARE_NONSTD(type) type __cdecl #define SWITCH_MOD_DECLARE_DATA #elif defined(MOD_EXPORTS) #define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __stdcall +#define SWITCH_MOD_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) #else #define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __stdcall +#define SWITCH_MOD_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl #define SWITCH_MOD_DECLARE_DATA __declspec(dllimport) #endif #define SIGHUP SIGTERM @@ -170,6 +173,7 @@ #define SWITCH_DECLARE_NONSTD(type) __attribute__((visibility("default"))) type #define SWITCH_DECLARE_DATA __attribute__((visibility("default"))) #define SWITCH_MOD_DECLARE(type) __attribute__((visibility("default"))) type +#define SWITCH_MOD_DECLARE_NONSTD(type) __attribute__((visibility("default"))) type #define SWITCH_MOD_DECLARE_DATA __attribute__((visibility("default"))) #define SWITCH_DECLARE_CLASS __attribute__((visibility("default"))) #else @@ -177,6 +181,7 @@ #define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_DECLARE_DATA #define SWITCH_MOD_DECLARE(type) type +#define SWITCH_MOD_DECLARE_NONSTD(type) type #define SWITCH_MOD_DECLARE_DATA #define SWITCH_DECLARE_CLASS #endif Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Thu Apr 9 10:28:52 2009 @@ -77,7 +77,7 @@ static executeBackgroundFunction executeBackgroundDelegate; static loadAssemblyFunction loadAssemblyDelegate; -SWITCH_MOD_DECLARE(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, loadAssemblyFunction loadAssembly) +SWITCH_MOD_DECLARE_NONSTD(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, loadAssemblyFunction loadAssembly) { runDelegate = run; executeDelegate = execute; @@ -88,7 +88,7 @@ // Sets up delegates (and anything else needed) on the ManagedSession object // Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC // Exported method. -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) +SWITCH_MOD_DECLARE_NONSTD(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) { switch_assert(session); if (!session) { Modified: freeswitch/trunk/src/mod/languages/mod_managed/switch_platform.i ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/switch_platform.i (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/switch_platform.i Thu Apr 9 10:28:52 2009 @@ -31,6 +31,7 @@ #define SWITCH_DECLARE(type) type #define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_MOD_DECLARE(type) type +#define SWITCH_MOD_DECLARE_NONSTD(type) type #define SWITCH_DECLARE_DATA #define SWITCH_MOD_DECLARE_DATA #define SWITCH_THREAD_FUNC Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Thu Apr 9 10:28:52 2009 @@ -332,7 +332,7 @@ /*.next */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) +SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) { *module_interface = &DB_module_interface; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Thu Apr 9 10:28:52 2009 @@ -240,7 +240,7 @@ /*.next */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) +SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) { curl_global_init(CURL_GLOBAL_ALL); *module_interface = &curl_module_interface; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Thu Apr 9 10:28:52 2009 @@ -533,7 +533,7 @@ /*.next */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) +SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) { *module_interface = &odbc_module_interface; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c Thu Apr 9 10:28:52 2009 @@ -324,7 +324,7 @@ /*.next */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) +SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) { *module_interface = &socket_module_interface; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Thu Apr 9 10:28:52 2009 @@ -346,7 +346,7 @@ /*.next */ NULL }; -SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) +SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface) { *module_interface = &teletone_module_interface; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r12959 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 09 Apr '09

09 Apr '09

Author: stkn Date: Thu Apr 9 10:14:18 2009 New Revision: 12959 Log: Fix C99 error, move var declaration out of the "for()" statement (no -std=c99?) Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Thu Apr 9 10:14:18 2009 @@ -276,7 +276,8 @@ } } else if (!strcasecmp(subcmd, "status")) { switch_bool_t verbose = SWITCH_FALSE; - + int x; + if (argc > 1) { if (!strcasecmp(argv[1], "verbose")) { verbose = SWITCH_TRUE; @@ -291,7 +292,7 @@ server_list = memcached_server_list(memcached); server_count = memcached_server_count(memcached); stream->write_function(stream, "Servers: %d\n", server_count); - for (int x=0; x < server_count; x++) { + for (x = 0; x < server_count; x++) { stream->write_function(stream, " %s (%u)\n", memcached_server_name(memcached, server_list[x]), memcached_server_port(memcached, server_list[x])); if (verbose == SWITCH_TRUE) { char **list;

1 0

[commit] r12958 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Apr '09

09 Apr '09

Author: anthm Date: Thu Apr 9 08:13:59 2009 New Revision: 12958 Log: add missing begin/end allow threads to read and play_and_get_digits methods Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Thu Apr 9 08:13:59 2009 @@ -755,7 +755,10 @@ timeout = 1; } + begin_allow_threads(); switch_ivr_read(session, min_digits, max_digits, prompt_audio_file, NULL, dtmf_buf, sizeof(dtmf_buf), timeout, valid_terminators); + end_allow_threads(); + return dtmf_buf; } @@ -774,6 +777,7 @@ this_check((char *)""); begin_allow_threads(); memset(dtmf_buf, 0, sizeof(dtmf_buf)); + begin_allow_threads(); status = switch_play_and_get_digits( session, (uint32_t) min_digits, (uint32_t) max_digits, @@ -786,6 +790,7 @@ dtmf_buf, sizeof(dtmf_buf), digits_regex); + end_allow_threads(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playAndGetDigits dtmf_buf: %s\n", dtmf_buf);

1 0

[commit] r12957 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 09 Apr '09

09 Apr '09

Author: anthm Date: Thu Apr 9 07:48:42 2009 New Revision: 12957 Log: MODAPP-253 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Apr 9 07:48:42 2009 @@ -40,7 +40,7 @@ SWITCH_STANDARD_DIALPLAN(inline_dialplan_hunt) { switch_caller_extension_t *extension = NULL; - char *argv[4] = { 0 }; + char *argv[128] = { 0 }; int argc; switch_channel_t *channel = switch_core_session_get_channel(session); int x = 0;

1 0

[commit] r12956 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: gmaruzz Date: Wed Apr 8 17:08:31 2009 New Revision: 12956 Log: skypiax: fixed assignment before declaration on Windows VC++: thx to Carlos Talbot Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Wed Apr 8 17:08:31 2009 @@ -1025,9 +1025,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { - skypiax_module_pool = pool; switch_api_interface_t *commands_api_interface; + skypiax_module_pool = pool; memset(&globals, '\0', sizeof(globals)); running = 1;

1 0

[commit] r12955 - freeswitch/trunk/build
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 16:24:43 2009 New Revision: 12955 Log: Add mod_memcache (commented) to modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed Apr 8 16:24:43 2009 @@ -19,6 +19,7 @@ #applications/mod_rss #applications/mod_snom #applications/mod_vmd +#applications/mod_memcache #asr_tts/mod_flite #asr_tts/mod_pocketsphinx #asr_tts/mod_cepstral

1 0

[commit] r12954 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: mrene Date: Wed Apr 8 15:30:41 2009 New Revision: 12954 Log: Also unbind the reloadxml event handler on shutdown Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 8 15:30:41 2009 @@ -367,6 +367,9 @@ if (globals.memcached) { memcached_free(globals.memcached); } + + switch_event_unbind(&NODE); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12953 - in freeswitch/trunk/src: . include mod/endpoints/mod_loopback
by FreeSWITCH SVN 08 Apr '09

08 Apr '09

Author: anthm Date: Wed Apr 8 13:43:10 2009 New Revision: 12953 Log: FSCORE-349 Modified: freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Wed Apr 8 13:43:10 2009 @@ -68,6 +68,7 @@ switch_bool_t m; /*! frame flags */ switch_frame_flag_t flags; + switch_core_session_t *session; }; SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Apr 8 13:43:10 2009 @@ -115,12 +115,10 @@ if (tech_pvt->read_codec.implementation) { switch_core_codec_destroy(&tech_pvt->read_codec); - memset(&tech_pvt->read_codec, 0, sizeof(tech_pvt->read_codec)); } if (tech_pvt->write_codec.implementation) { switch_core_codec_destroy(&tech_pvt->write_codec); - memset(&tech_pvt->write_codec, 0, sizeof(tech_pvt->write_codec)); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setup codec %s/%d/%d\n", switch_channel_get_name(channel), iananame, rate, interval); @@ -161,7 +159,9 @@ tech_pvt->write_frame.data = tech_pvt->write_databuf; tech_pvt->write_frame.buflen = sizeof(tech_pvt->write_databuf); + tech_pvt->write_frame.codec = &tech_pvt->write_codec; + tech_pvt->cng_frame.data = tech_pvt->cng_databuf; tech_pvt->cng_frame.buflen = sizeof(tech_pvt->cng_databuf); switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); @@ -362,7 +362,6 @@ switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); tech_pvt->other_tech_pvt = NULL; } - switch_mutex_unlock(tech_pvt->mutex); if (tech_pvt->other_session) { switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); @@ -370,17 +369,16 @@ tech_pvt->other_channel = NULL; tech_pvt->other_session = NULL; } + switch_mutex_unlock(tech_pvt->mutex); switch_core_timer_destroy(&tech_pvt->timer); if (tech_pvt->read_codec.implementation) { switch_core_codec_destroy(&tech_pvt->read_codec); - memset(&tech_pvt->read_codec, 0, sizeof(tech_pvt->read_codec)); } if (tech_pvt->write_codec.implementation) { switch_core_codec_destroy(&tech_pvt->write_codec); - memset(&tech_pvt->write_codec, 0, sizeof(tech_pvt->write_codec)); } return SWITCH_STATUS_SUCCESS; @@ -518,33 +516,21 @@ mutex = tech_pvt->mutex; switch_mutex_lock(mutex); - while(switch_test_flag(tech_pvt, TFLAG_LINKED) && tech_pvt->other_tech_pvt) { - if (!switch_channel_ready(channel)) { - goto end; - } - if (switch_test_flag(tech_pvt, TFLAG_CNG)) { - break; - } - - if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { - break; - } - - if (switch_core_timer_check(&tech_pvt->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - switch_set_flag(tech_pvt, TFLAG_CNG); - break; - } + + if (!switch_channel_ready(channel)) { + goto end; + } - switch_cond_next(); + if (!switch_test_flag(tech_pvt, TFLAG_CNG) && !switch_test_flag(tech_pvt, TFLAG_WRITE)) { + switch_core_timer_next(&tech_pvt->timer); } - if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { - if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { - switch_core_timer_sync(&tech_pvt->timer); - *frame = &tech_pvt->other_tech_pvt->write_frame; - switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); - switch_clear_flag_locked(tech_pvt, TFLAG_CNG); - } + if (switch_test_flag(tech_pvt, TFLAG_WRITE)) { + *frame = &tech_pvt->write_frame; + switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); + switch_clear_flag_locked(tech_pvt, TFLAG_CNG); + } else { + switch_set_flag(tech_pvt, TFLAG_CNG); } if (switch_test_flag(tech_pvt, TFLAG_CNG)) { @@ -555,7 +541,7 @@ } - if (*frame && switch_test_flag(tech_pvt, TFLAG_LINKED)) { + if (*frame) { status = SWITCH_STATUS_SUCCESS; } else { status = SWITCH_STATUS_FALSE; @@ -624,12 +610,12 @@ tech_init(tech_pvt->other_tech_pvt, tech_pvt->other_session, frame->codec); } - memcpy(&tech_pvt->write_frame, frame, sizeof(*frame)); - tech_pvt->write_frame.data = tech_pvt->write_databuf; - tech_pvt->write_frame.buflen = sizeof(tech_pvt->write_databuf); - tech_pvt->write_frame.codec = &tech_pvt->write_codec; - memcpy(tech_pvt->write_frame.data, frame->data, frame->datalen); - switch_set_flag_locked(tech_pvt, TFLAG_WRITE); + memcpy(&tech_pvt->other_tech_pvt->write_frame, frame, sizeof(*frame)); + tech_pvt->other_tech_pvt->write_frame.data = tech_pvt->other_tech_pvt->write_databuf; + tech_pvt->other_tech_pvt->write_frame.buflen = sizeof(tech_pvt->other_tech_pvt->write_databuf); + //tech_pvt->other_tech_pvt->write_frame.codec = &tech_pvt->other_tech_pvt->write_codec; + memcpy(tech_pvt->other_tech_pvt->write_frame.data, frame->data, frame->datalen); + switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); status = SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Apr 8 13:43:10 2009 @@ -206,11 +206,7 @@ need_codec = TRUE; } - if (session->read_codec && !(*frame)->codec) { - need_codec = TRUE; - } - - if (!session->read_codec && (*frame)->codec) { + if (!(session->read_codec && (*frame)->codec && (*frame)->codec->implementation)) { status = SWITCH_STATUS_FALSE; goto done; } @@ -533,6 +529,8 @@ *frame = &runtime.dummy_cng_frame; } + (*frame)->session = session; + switch_mutex_unlock(session->read_codec->mutex); switch_mutex_unlock(session->codec_read_mutex); @@ -610,9 +608,8 @@ } switch_mutex_lock(session->write_codec->mutex); - + switch_mutex_lock(frame->codec->mutex); - if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { if (session->write_impl.codec_id == frame->codec->implementation->codec_id || session->write_impl.microseconds_per_packet != frame->codec->implementation->microseconds_per_packet) { @@ -661,8 +658,8 @@ frame->datalen, session->write_impl.actual_samples_per_second, session->raw_write_frame.data, &session->raw_write_frame.datalen, &session->raw_write_frame.rate, &flag); - - + + if (do_resample && status == SWITCH_STATUS_SUCCESS) { @@ -682,6 +679,7 @@ session->write_impl.decoded_bytes_per_packet, SWITCH_RESAMPLE_QUALITY); + switch_mutex_unlock(session->resample_mutex); if (status != SWITCH_STATUS_SUCCESS) { goto done; @@ -725,19 +723,31 @@ } } + + if (session->write_resampler) { short *data = write_frame->data; switch_mutex_lock(session->resample_mutex); - switch_resample_process(session->write_resampler, data, write_frame->datalen / 2); - memcpy(data, session->write_resampler->to, session->write_resampler->to_len * 2); - write_frame->samples = session->write_resampler->to_len; - write_frame->datalen = write_frame->samples * 2; - write_frame->rate = session->write_resampler->to_rate; - did_write_resample = 1; + if (session->write_resampler) { + + switch_resample_process(session->write_resampler, data, write_frame->datalen / 2); + + memcpy(data, session->write_resampler->to, session->write_resampler->to_len * 2); + + write_frame->samples = session->write_resampler->to_len; + + write_frame->datalen = write_frame->samples * 2; + + write_frame->rate = session->write_resampler->to_rate; + + did_write_resample = 1; + } switch_mutex_unlock(session->resample_mutex); } + + if (session->bugs && !switch_channel_test_flag(session->channel, CF_PAUSE_BUGS)) { switch_media_bug_t *bp, *dp, *last = NULL; @@ -804,7 +814,9 @@ write_frame->codec->implementation->decoded_bytes_per_packet == session->write_impl.decoded_bytes_per_packet) { perfect = TRUE; } + + if (perfect) { if (write_frame->datalen < session->write_impl.decoded_bytes_per_packet) { @@ -822,6 +834,9 @@ session->write_impl.actual_samples_per_second, session->enc_write_frame.data, &session->enc_write_frame.datalen, &session->enc_write_frame.rate, &flag); + + + switch (status) { case SWITCH_STATUS_RESAMPLE: resample++; @@ -864,6 +879,7 @@ if (flag & SFF_CNG) { switch_set_flag(write_frame, SFF_CNG); } + status = perform_write(session, write_frame, flags, stream_id); goto error; } else { @@ -924,6 +940,8 @@ &session->enc_write_frame.rate, &flag); + + switch (status) { case SWITCH_STATUS_RESAMPLE: resample++; @@ -935,14 +953,17 @@ write_frame = &session->enc_write_frame; if (!session->write_resampler) { switch_mutex_lock(session->resample_mutex); - status = switch_resample_create(&session->write_resampler, - frame->codec->implementation->actual_samples_per_second, - session->write_impl.actual_samples_per_second, - session->write_impl.decoded_bytes_per_packet, - SWITCH_RESAMPLE_QUALITY); - + if (!session->write_resampler) { + status = switch_resample_create(&session->write_resampler, + frame->codec->implementation->actual_samples_per_second, + session->write_impl.actual_samples_per_second, + session->write_impl.decoded_bytes_per_packet, + SWITCH_RESAMPLE_QUALITY); + } switch_mutex_unlock(session->resample_mutex); + + if (status != SWITCH_STATUS_SUCCESS) { goto done; } @@ -959,8 +980,10 @@ case SWITCH_STATUS_NOOP: if (session->write_resampler) { switch_mutex_lock(session->resample_mutex); - switch_resample_destroy(&session->write_resampler); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating write resampler\n"); + if (session->write_resampler) { + switch_resample_destroy(&session->write_resampler); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating write resampler\n"); + } switch_mutex_unlock(session->resample_mutex); } enc_frame->codec = session->write_codec; @@ -985,11 +1008,13 @@ if (!did_write_resample && session->read_resampler) { short *data = write_frame->data; switch_mutex_lock(session->resample_mutex); - switch_resample_process(session->read_resampler, data, write_frame->datalen / 2); - memcpy(data, session->read_resampler->to, session->read_resampler->to_len * 2); - write_frame->samples = session->read_resampler->to_len; - write_frame->datalen = session->read_resampler->to_len * 2; - write_frame->rate = session->read_resampler->to_rate; + if (session->read_resampler) { + switch_resample_process(session->read_resampler, data, write_frame->datalen / 2); + memcpy(data, session->read_resampler->to, session->read_resampler->to_len * 2); + write_frame->samples = session->read_resampler->to_len; + write_frame->datalen = session->read_resampler->to_len * 2; + write_frame->rate = session->read_resampler->to_rate; + } switch_mutex_unlock(session->resample_mutex); } @@ -1002,9 +1027,7 @@ write_frame->timestamp = 0; } - status = perform_write(session, write_frame, flags, stream_id); - - if (status != SWITCH_STATUS_SUCCESS) { + if ((status = perform_write(session, write_frame, flags, stream_id)) != SWITCH_STATUS_SUCCESS) { break; } } @@ -1021,12 +1044,18 @@ } if (do_write) { + + + status = perform_write(session, write_frame, flags, stream_id); + + } error: switch_mutex_unlock(session->write_codec->mutex); + switch_mutex_unlock(frame->codec->mutex); switch_mutex_unlock(session->codec_write_mutex); return status;

1 0