Changeset 3187

Timestamp:

May 26, 2010 5:23:32 PM (14 years ago)

Author:

nanang

Message:

Re #1066, in process_m_answer() of sdp_neg.c:

• Fixed removing any unmatching formats in the remote-answer to also work with dynamic payload type.
• Updated reordering formats priority in the offer based on the answer to also work with dynamic payload type.

File:

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

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

@@ -816 +816 @@
 
     } else {
+        /* Offer format priority based on answer format index/priority */
+        unsigned offer_fmt_prior[PJMEDIA_MAX_SDP_FMT];
+
         /* Remove all format in the offer that has no matching answer */
         for (i=0; i<offer->desc.fmt_count;) {
@@ -908 +911 @@
 
             } else {
+                offer_fmt_prior[i] = j;
                 ++i;
             }
@@ -917 +921 @@
         }
 
-        /* Arrange format in the offer so the order match the priority
-         * in the answer
+        /* Post process:
+         * - Resort offer formats so the order match to the answer.
+         * - Remove answer formats that unmatches to the offer.
          */
-        for (i=0; i<answer->desc.fmt_count; ++i) {
+        
+        /* Resort offer formats */
+        for (i=0; i<offer->desc.fmt_count; ++i) {
             unsigned j;
-            pj_str_t *fmt = &answer->desc.fmt[i];
-
-            for (j=i; j<offer->desc.fmt_count; ++j) {
-                if (pj_strcmp(fmt, &offer->desc.fmt[j])==0) {
+            for (j=i+1; j<offer->desc.fmt_count; ++j) {
+                if (offer_fmt_prior[i] > offer_fmt_prior[j]) {
+                    unsigned tmp = offer_fmt_prior[i];
+                    offer_fmt_prior[i] = offer_fmt_prior[j];
+                    offer_fmt_prior[j] = tmp;
                     str_swap(&offer->desc.fmt[i], &offer->desc.fmt[j]);
-                    break;
                 }
             }
-
-            /* If this answer format has no matching format, let's remove it
-             * from the answer.
-             */
-            if (j >= offer->desc.fmt_count) {
-                pjmedia_sdp_attr *a;
-
-                /* Remove rtpmap associated with this format */
-                a = pjmedia_sdp_media_find_attr2(answer, "rtpmap", fmt);
-                if (a)
-                    pjmedia_sdp_media_remove_attr(answer, a);
-
-                /* Remove fmtp associated with this format */
-                a = pjmedia_sdp_media_find_attr2(answer, "fmtp", fmt);
-                if (a)
-                    pjmedia_sdp_media_remove_attr(answer, a);
-
-                /* Remove this format from answer's array */
-                pj_array_erase(answer->desc.fmt, sizeof(answer->desc.fmt[0]),
-                               answer->desc.fmt_count, i);
-                --answer->desc.fmt_count;
+        }
+
+        /* Remove unmatched answer formats */
+        {
+            unsigned del_cnt = 0;
+            for (i=0; i<answer->desc.fmt_count;) {
+                /* The offer is ordered now, also the offer_fmt_prior */
+                if (i >= offer->desc.fmt_count || 
+                    offer_fmt_prior[i]-del_cnt != i)
+                {
+                    pj_str_t *fmt = &answer->desc.fmt[i];
+                    pjmedia_sdp_attr *a;
+
+                    /* Remove rtpmap associated with this format */
+                    a = pjmedia_sdp_media_find_attr2(answer, "rtpmap", fmt);
+                    if (a)
+                        pjmedia_sdp_media_remove_attr(answer, a);
+
+                    /* Remove fmtp associated with this format */
+                    a = pjmedia_sdp_media_find_attr2(answer, "fmtp", fmt);
+                    if (a)
+                        pjmedia_sdp_media_remove_attr(answer, a);
+
+                    /* Remove this format from answer's array */
+                    pj_array_erase(answer->desc.fmt, 
+                                   sizeof(answer->desc.fmt[0]),
+                                   answer->desc.fmt_count, i);
+                    --answer->desc.fmt_count;
+
+                    ++del_cnt;
+                } else {
+                    ++i;
+                }
             }
         }