From aa654be2a388aa684fdc5b058c7c8365675ff8d2 Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Wed, 14 Sep 2016 19:43:18 +0000 Subject: Re #1952: Apply the fix to video stream info as well git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5436 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia/vid_stream_info.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'pjmedia/src') diff --git a/pjmedia/src/pjmedia/vid_stream_info.c b/pjmedia/src/pjmedia/vid_stream_info.c index 0d38e1a2..9782638c 100644 --- a/pjmedia/src/pjmedia/vid_stream_info.c +++ b/pjmedia/src/pjmedia/vid_stream_info.c @@ -299,9 +299,17 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_info_from_sdp( return PJMEDIA_EINVALIDIP; } - /* Local and remote address family must match */ - if (local_af != rem_af) - return PJ_EAFNOTSUP; + /* Local and remote address family must match, except when ICE is used + * by both sides (see also ticket #1952). + */ + if (local_af != rem_af) { + const pj_str_t STR_ICE_CAND = { "candidate", 9 }; + if (pjmedia_sdp_media_find_attr(rem_m, &STR_ICE_CAND, NULL)==NULL || + pjmedia_sdp_media_find_attr(local_m, &STR_ICE_CAND, NULL)==NULL) + { + return PJ_EAFNOTSUP; + } + } /* Media direction: */ -- cgit v1.2.3