Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/vid_stream_info.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/vid_stream_info.c (modified) (1 diff)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/vid_stream_info.c

@@ -300 +300 @@
     }
 
-    /* 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: */