kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tweak (work in progress) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1816 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2006-07-10 20:28:22 +00:00
parent d99c1605a1
commit e9fc56225f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2233,7 +2233,7 @@ static void conference_function(switch_core_session_t *session, char *data)
if (switch_core_codec_init(&member.read_codec, if (switch_core_codec_init(&member.read_codec,
"L16", "L16",
read_codec->implementation->samples_per_second, read_codec->implementation->samples_per_second,
conference->interval, read_codec->implementation->microseconds_per_frame / 1000,
1, 1,
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
NULL, NULL,
@ -2251,7 +2251,7 @@ static void conference_function(switch_core_session_t *session, char *data)
if (switch_core_codec_init(&member.write_codec, if (switch_core_codec_init(&member.write_codec,
"L16", "L16",
read_codec->implementation->samples_per_second, read_codec->implementation->samples_per_second,
conference->interval, read_codec->implementation->microseconds_per_frame / 1000,
1, 1,
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
NULL, NULL,

11
src/mod/endpoints/mod_exosip/mod_exosip.c
View File

@ -1336,18 +1336,20 @@ static switch_status_t exosip_create_call(eXosip_event_t * event)
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) { 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"); 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++) { 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], osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos],
mline); mline);
if (parse_sdp_media(tech_pvt, audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) { if (parse_sdp_media(tech_pvt, audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
tech_pvt->payload_num = atoi(dpayload); tech_pvt->payload_num = atoi(dpayload);
break; goto done;
} }
} }
mline++; mline++;
} }
done:
free(remote_sdp_str); free(remote_sdp_str);
sdp_message_o_origin_set(tech_pvt->local_sdp, "FreeSWITCH", "0", "0", "IN", "IP4", ip); sdp_message_o_origin_set(tech_pvt->local_sdp, "FreeSWITCH", "0", "0", "IN", "IP4", ip);
@ -1545,7 +1547,7 @@ static switch_status_t parse_sdp_media(struct private_object *tech_pvt, sdp_medi
*dpayload = strdup(payload); *dpayload = strdup(payload);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Found negotiated codec Payload: %s Name: %s Rate: %s\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Found negotiated codec Payload: %s Name: %s Rate: %s\n",
*dpayload, *dname, *drate); *dpayload, *dname, *drate);
goto done; return SWITCH_STATUS_SUCCESS;
} }
} }
@ -1553,7 +1555,6 @@ static switch_status_t parse_sdp_media(struct private_object *tech_pvt, sdp_medi
attr = NULL; attr = NULL;
pos++; pos++;
} }
done:
return status; return status;
} }