Commit a3a4fe17 authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' into dev_multicall

Conflicts:
	mediastreamer2
parents d37e618a e7eb4edf
......@@ -2097,6 +2097,7 @@ static RtpProfile *make_profile(LinphoneCore *lc, const SalMediaDescription *md,
RtpProfile *prof=rtp_profile_new("Call profile");
bool_t first=TRUE;
int remote_bw=0;
*used_pt=-1;
for(elem=desc->payloads;elem!=NULL;elem=elem->next){
PayloadType *pt=(PayloadType*)elem->data;
......@@ -2157,7 +2158,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
{
const SalStreamDescription *stream=sal_media_description_find_stream(call->resultdesc,
SalProtoRtpAvp,SalAudio);
if (stream){
if (stream && stream->port!=0){
call->audio_profile=make_profile(lc,call->resultdesc,stream,&used_pt);
if (!lc->use_files){
MSSndCard *playcard=lc->sound_conf.lsd_card ?
......@@ -2207,7 +2208,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
video_preview_stop(lc->previewstream);
lc->previewstream=NULL;
}
if (stream && (lc->video_conf.display || lc->video_conf.capture)) {
if (stream && stream->port!=0 && (lc->video_conf.display || lc->video_conf.capture)) {
const char *addr=stream->addr[0]!='\0' ? stream->addr : call->resultdesc->addr;
call->video_profile=make_profile(lc,call->resultdesc,stream,&used_pt);
video_stream_set_sent_video_size(lc->videostream,linphone_core_get_preferred_video_size(lc));
......@@ -2227,6 +2228,8 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
stream->port+1,
used_pt, jitt_comp, lc->video_conf.device);
video_stream_set_rtcp_information(lc->videostream, cname,tool);
}else{
ms_warning("No valid video stream defined.");
}
}
#endif
......
mediastreamer2 @ a2a61192
Subproject commit 7a9d0bf6b6be4ee0728db94bc0e1b661ee87e1d2
Subproject commit a2a6119273226234ea7300742c34d46fa545fcd8
oRTP @ b9b53eed
Subproject commit 4ad63e9a106aee8d9dfb675aa0532962f322609c
Subproject commit b9b53eedef812b44762976617840c2b98fca62b9
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment