Changeset 3160 for pjproject

Timestamp:

May 7, 2010 7:09:16 AM (14 years ago)

Author:

nanang

Message:

Fixed #1066:

• Added check if the negotiation result of local-offer/remote-answer has no matching format.
• Added routine to remove any unmatching formats in the remote-answer.

File:

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

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

@@ -912 +912 @@
         }
 
+        if (0 == offer->desc.fmt_count) {
+            /* No common codec in the answer! */
+            return PJMEDIA_SDPNEG_EANSNOMEDIA;
+        }
+
         /* Arrange format in the offer so the order match the priority
          * in the answer
@@ -924 +929 @@
                     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;
             }
         }