Changeset 2724 for pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

Timestamp:

May 29, 2009 1:04:03 PM (15 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -866 +866 @@
                         {
                             /* Further check for G7221, negotiate bitrate. */
-                            if (pj_strcmp2(&or_.enc_name, "G7221") == 0) {
+                            if (pj_stricmp2(&or_.enc_name, "G7221") == 0) {
                                 if (match_g7221(offer, i, answer, j))
                                     break;
                             } else
                             /* Further check for AMR, negotiate fmtp. */
-                            if (pj_strcmp2(&or_.enc_name, "AMR") == 0) {
+                            if (pj_stricmp2(&or_.enc_name, "AMR") == 0 ||
+                                pj_stricmp2(&or_.enc_name, "AMR-WB") == 0) 
+                            {
                                 if (match_amr(offer, i, answer, j, PJ_FALSE, 
                                               NULL))
@@ -1071 +1073 @@
                 pjmedia_sdp_attr_get_rtpmap(a, &or_);
 
-                if (!pj_strcmp2(&or_.enc_name, "telephone-event")) {
+                if (!pj_stricmp2(&or_.enc_name, "telephone-event")) {
                     master_has_telephone_event = 1;
                     if (found_matching_telephone_event)
@@ -1098 +1100 @@
                         if (!pj_stricmp(&or_.enc_name, &lr.enc_name) &&
                             or_.clock_rate == lr.clock_rate &&
-                            (pj_strcmp(&or_.param, &lr.param)==0 ||
+                            (pj_stricmp(&or_.param, &lr.param)==0 ||
                              (or_.param.slen==1 && *or_.param.ptr=='1'))) 
                         {
@@ -1104 +1106 @@
                             if (is_codec) {
                                 /* Further check for G7221, negotiate bitrate */
-                                if (pj_strcmp2(&or_.enc_name, "G7221") == 0 &&
+                                if (pj_stricmp2(&or_.enc_name, "G7221") == 0 &&
                                     !match_g7221(master, i, slave, j))
                                 {
@@ -1110 +1112 @@
                                 } else 
                                 /* Further check for AMR, negotiate fmtp */
-                                if (pj_strcmp2(&or_.enc_name, "AMR")==0) {
+                                if (pj_stricmp2(&or_.enc_name, "AMR")==0 ||
+                                    pj_stricmp2(&or_.enc_name, "AMR-WB")==0) 
+                                {
                                     unsigned o_med_idx, a_med_idx;