Author: brian Date: Mon Jul 10 16:28:22 2006 New Revision: 1816 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Log: tweak (work in progress) 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 Mon Jul 10 16:28:22 2006 @@ -2233,7 +2233,7 @@ if (switch_core_codec_init(&member.read_codec, "L16", read_codec->implementation->samples_per_second, - conference->interval, + read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, @@ -2251,7 +2251,7 @@ if (switch_core_codec_init(&member.write_codec, "L16", read_codec->implementation->samples_per_second, - conference->interval, + read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Mon Jul 10 16:28:22 2006 @@ -1336,18 +1336,20 @@ if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Got no compatible codecs!\n"); - break; + goto done; } for (pos = 0; audio_tab[pos] != NULL; pos++) { osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos], mline); if (parse_sdp_media(tech_pvt, audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) { - tech_pvt->payload_num = atoi(dpayload); - break; + tech_pvt->payload_num = atoi(dpayload); + goto done; } } mline++; } + done: + free(remote_sdp_str); sdp_message_o_origin_set(tech_pvt->local_sdp, "FreeSWITCH", "0", "0", "IN", "IP4", ip); @@ -1545,7 +1547,7 @@ *dpayload = strdup(payload); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Found negotiated codec Payload: %s Name: %s Rate: %s\n", *dpayload, *dname, *drate); - goto done; + return SWITCH_STATUS_SUCCESS; } } @@ -1553,7 +1555,6 @@ attr = NULL; pos++; } - done: return status; }