mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-30 17:59:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash at linphone_core_destroy() when add_missing_audio_codecs or add_missing_video_codec is set to 0.

Browse source
This commit is contained in:
Simon Morlat 2016-05-23 21:59:41 +02:00
parent d2b8cb2dd5
commit f17014999b
3 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
coreapi/linphonecore.c
View file

@ -1264,6 +1264,38 @@ static MSList *add_missing_supported_codecs(LinphoneCore *lc, const MSList *defa
return newlist;
}
/*
* This function adds missing codecs, if required by configuration.
* This 'l' list is entirely destroyed and a new list is returned.
*/
static MSList *handle_missing_codecs(LinphoneCore *lc, const MSList *default_list, MSList *l, MSFormatType ft){
const char *name = "unknown";
int add_missing;
MSList *ret;
switch(ft){
case MSAudio:
name = "add_missing_audio_codecs";
break;
case MSVideo:
name = "add_missing_video_codecs";
break;
case MSText:
name = "add_missing_text_codecs";
break;
case MSUnknownMedia:
break;
}
add_missing = lp_config_get_int(lc->config, "misc", name, 1);
if (add_missing){
ret = add_missing_supported_codecs(lc, default_list, l);
}else{
ret = ms_list_copy_with_data(l,(void *(*)(void*))payload_type_clone);
ms_list_free(l);
}
return ret;
}
static MSList *codec_append_if_new(MSList *l, PayloadType *pt){
MSList *elem;
for (elem=l;elem!=NULL;elem=elem->next){
@ -1275,8 +1307,7 @@ static MSList *codec_append_if_new(MSList *l, PayloadType *pt){
return l;
}
static void codecs_config_read(LinphoneCore *lc)
{
static void codecs_config_read(LinphoneCore *lc){
int i;
PayloadType *pt;
MSList *audio_codecs=NULL;
@ -1291,18 +1322,15 @@ static void codecs_config_read(LinphoneCore *lc)
audio_codecs=codec_append_if_new(audio_codecs, pt);
}
}
if( lp_config_get_int(lc->config, "misc", "add_missing_audio_codecs", 1) == 1 ){
audio_codecs=add_missing_supported_codecs(lc, lc->default_audio_codecs,audio_codecs);
}
audio_codecs = handle_missing_codecs(lc, lc->default_audio_codecs,audio_codecs, MSAudio);
for (i=0;get_codec(lc,SalVideo,i,&pt);i++){
if (pt){
video_codecs=codec_append_if_new(video_codecs, pt);
}
}
if( lp_config_get_int(lc->config, "misc", "add_missing_video_codecs", 1) == 1 ){
video_codecs=add_missing_supported_codecs(lc, lc->default_video_codecs,video_codecs);
}
video_codecs = handle_missing_codecs(lc, lc->default_video_codecs, video_codecs, MSVideo);
for (i=0;get_codec(lc,SalText,i,&pt);i++){
if (pt){

2
mediastreamer2

@ -1 +1 @@
Subproject commit 24d1f43234e9dcf07f6c803d9aa94317fe44dbf0
Subproject commit fd98500399f8105534696deb7f3196b7b213aedd

2
oRTP

@ -1 +1 @@
Subproject commit 5b1c601c74c2b3e0d4ab247c08a7b2ef3fb00e85
Subproject commit d10bdd4832efa9b3bd6ce99b71873ca33326e812