Changeset 1069
- Timestamp:
- Mar 15, 2007 9:09:41 PM (18 years ago)
- 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 33 33 * <pjmedia/config.h> 34 34 */ 35 #if PJMEDIA_RTP_PT_TELEPHONE_EVENTS 35 36 PJMEDIA_RTP_PT_START = PJMEDIA_RTP_PT_TELEPHONE_EVENTS, 37 #else 38 PJMEDIA_RTP_PT_START = 102, 39 #endif 36 40 37 41 PJMEDIA_RTP_PT_SPEEX_NB, /**< Speex narrowband/8KHz */ -
pjproject/branches/pjproject-0.5-stable/pjmedia/src/pjmedia/sdp_neg.c
r1057 r1069 804 804 805 805 /* See if all types of offer can be matched. */ 806 #if 1807 806 if (offer_has_codec && !found_matching_codec) { 808 807 return PJMEDIA_SDPNEG_NOANSCODEC; 809 808 } 810 809 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 811 813 if (offer_has_telephone_event && !found_matching_telephone_event) { 812 814 return PJMEDIA_SDPNEG_NOANSTELEVENT; 813 815 } 816 */ 814 817 815 818 if (offer_has_other && !found_matching_other) { 816 819 return PJMEDIA_SDPNEG_NOANSUNKNOWN; 817 820 } 818 #else819 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 #endif828 821 829 822 /* Seems like everything is in order.
Note: See TracChangeset
for help on using the changeset viewer.