Changeset 2718

Timestamp:

May 20, 2009 2:26:42 PM (15 years ago)

Author:

nanang

Message:

Ticket #859:

• Fixed AMR-WB negotiation in sdp_neg.c
• Updated encoding name comparison to use case-insenstive
• Set default AMR pack mode to be octet aligned.

Location:

pjproject/branches/projects/sipit24/pjmedia/src

Files:

• pjmedia-codec/ipp_codecs.c (modified) (2 diffs)
• pjmedia/sdp_neg.c (modified) (5 diffs)

pjproject/branches/projects/sipit24/pjmedia/src/pjmedia-codec/ipp_codecs.c

@@ -234 +234 @@
 {
 #   if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR
+    /* AMR-NB SID seems to produce noise, so let's just disable its VAD. */
     {1, "AMR",      PJMEDIA_RTP_PT_AMR,       &USC_GSMAMR_Fxns,  8000, 1, 160, 
                     7400, 12200, 2, 0, 1, 
-                    &predecode_amr, &parse_amr, &pack_amr
-                    /*, {1, {{{"octet-align", 11}, {"1", 1}}} } */
-                    , {1, {{{"mode-set", 8}, {"1,4,5", 5}}} }
+                    &predecode_amr, &parse_amr, &pack_amr,
+                    {1, {{{"octet-align", 11}, {"1", 1}}} }
     },
 #   endif
@@ -245 +245 @@
     {1, "AMR-WB",   PJMEDIA_RTP_PT_AMRWB,     &USC_AMRWB_Fxns,  16000, 1, 320,
                     15850, 23850, 1, 1, 1, 
-                    &predecode_amr, &parse_amr, &pack_amr
+                    &predecode_amr, &parse_amr, &pack_amr,
+                    {1, {{{"octet-align", 11}, {"1", 1}}} }
     },
 #   endif

pjproject/branches/projects/sipit24/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;