Changeset 5436


Ignore:
Timestamp:
Sep 14, 2016 7:43:18 PM (3 years ago)
Author:
ming
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/vid_stream_info.c

    r4890 r5436  
    300300    } 
    301301 
    302     /* Local and remote address family must match */ 
    303     if (local_af != rem_af) 
    304         return PJ_EAFNOTSUP; 
     302    /* Local and remote address family must match, except when ICE is used 
     303     * by both sides (see also ticket #1952). 
     304     */ 
     305    if (local_af != rem_af) { 
     306        const pj_str_t STR_ICE_CAND = { "candidate", 9 }; 
     307        if (pjmedia_sdp_media_find_attr(rem_m, &STR_ICE_CAND, NULL)==NULL || 
     308            pjmedia_sdp_media_find_attr(local_m, &STR_ICE_CAND, NULL)==NULL) 
     309        { 
     310            return PJ_EAFNOTSUP; 
     311        } 
     312    } 
    305313 
    306314    /* Media direction: */ 
Note: See TracChangeset for help on using the changeset viewer.