Changeset 5436 for pjproject

Timestamp:

Sep 14, 2016 7:43:18 PM (8 years ago)

Author:

ming

Message:

Re #1952: Apply the fix to video stream info as well

File:

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

pjproject/trunk/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: */