Changeset 1069


Ignore:
Timestamp:
Mar 15, 2007 9:09:41 PM (12 years ago)
Author:
bennylp
Message:

Fixed ticket #179: SDP negotiation failed when local doesn't specify telephone-event (thanks Esbjörn Dominique)

Location:
pjproject/branches/pjproject-0.5-stable/pjmedia
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/pjproject-0.5-stable/pjmedia/include/pjmedia-codec/types.h

    r974 r1069  
    3333     * <pjmedia/config.h> 
    3434     */ 
     35#if PJMEDIA_RTP_PT_TELEPHONE_EVENTS 
    3536    PJMEDIA_RTP_PT_START = PJMEDIA_RTP_PT_TELEPHONE_EVENTS, 
     37#else 
     38    PJMEDIA_RTP_PT_START = 102, 
     39#endif 
    3640 
    3741    PJMEDIA_RTP_PT_SPEEX_NB,                    /**< Speex narrowband/8KHz  */ 
  • pjproject/branches/pjproject-0.5-stable/pjmedia/src/pjmedia/sdp_neg.c

    r1057 r1069  
    804804 
    805805    /* See if all types of offer can be matched. */ 
    806 #if 1 
    807806    if (offer_has_codec && !found_matching_codec) { 
    808807        return PJMEDIA_SDPNEG_NOANSCODEC; 
    809808    } 
    810809 
     810    /* If this comment is removed, negotiation will fail if remote has offered 
     811       telephone-event and local is not configured with telephone-event 
     812 
    811813    if (offer_has_telephone_event && !found_matching_telephone_event) { 
    812814        return PJMEDIA_SDPNEG_NOANSTELEVENT; 
    813815    } 
     816    */ 
    814817 
    815818    if (offer_has_other && !found_matching_other) { 
    816819        return PJMEDIA_SDPNEG_NOANSUNKNOWN; 
    817820    } 
    818 #else 
    819     PJ_TODO(FULL_MATCHING_WITH_TELEPHONE_EVENTS); 
    820     if (!found_matching_codec && 
    821         !found_matching_telephone_event && 
    822         !found_matching_other) 
    823     { 
    824         /* Some of the payload in the offer has no matching local sdp */ 
    825         return PJ_FALSE; 
    826     } 
    827 #endif 
    828821 
    829822    /* Seems like everything is in order. 
Note: See TracChangeset for help on using the changeset viewer.