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

Timestamp:

Jun 4, 2010 1:41:34 PM (14 years ago)

Author:

nanang

Message:

Re #668:

• Fixed process_answer() of SDP negotiation, when no common format in a media, instead of returning error, it should just deactivate the media (offer & answer) and continue negotiating next media.
• Generalized the way of deactivating media: set port to 0 and remove all attributes.
• Added new API pjmedia_sdp_media_clone_deactivate() to clone media and deactivate the newly cloned media.
• Updated PJMEDIA SDP negotiation test.

File:

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

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

@@ -312 +312 @@
             pjmedia_sdp_media *m;
 
-            m = pjmedia_sdp_media_clone(pool, om);
-            m->desc.port = 0;
+            m = pjmedia_sdp_media_clone_deactivate(pool, om);
 
             pj_array_insert(new_offer->media, sizeof(new_offer->media[0]),
@@ -777 +776 @@
         
         /* Remote has rejected our offer. 
-         * Set our port to zero too in active SDP.
+         * Deactivate our media too.
          */
-        offer->desc.port = 0;
+        pjmedia_sdp_media_deactivate(pool, offer);
 
         /* Don't need to proceed */
@@ -1012 +1011 @@
 
             /* Generate matching-but-disabled-media for the answer */
-            am = pjmedia_sdp_media_clone(pool, offer->media[omi]);
-            am->desc.port = 0;
+            am = pjmedia_sdp_media_clone_deactivate(pool, offer->media[omi]);
             answer->media[answer->media_count++] = am;
             ++ami;
 
+            /* Deactivate our media offer too */
+            pjmedia_sdp_media_deactivate(pool, offer->media[omi]);
+
             /* No answer media to be negotiated */
-            offer->media[omi]->desc.port = 0;
             continue;
         }
@@ -1027 +1027 @@
         /* If media type is mismatched, just disable the media. */
         if (status == PJMEDIA_SDPNEG_EINVANSMEDIA) {
-            offer->media[omi]->desc.port = 0;
+            pjmedia_sdp_media_deactivate(pool, offer->media[omi]);
             continue;
         }
-
-        if (status != PJ_SUCCESS)
+        /* No common format in the answer media. */
+        else if (status == PJMEDIA_SDPNEG_EANSNOMEDIA) {
+            pjmedia_sdp_media_deactivate(pool, offer->media[omi]);
+            pjmedia_sdp_media_deactivate(pool, answer->media[ami]);
+        } 
+        /* Return the error code, for other errors. */
+        else if (status != PJ_SUCCESS) {
             return status;
+        }
 
         if (offer->media[omi]->desc.port != 0)
@@ -1065 +1071 @@
     pj_str_t pt_amr_need_adapt = {NULL, 0};
 
-    /* If offer has zero port, just clone the offer and update direction */
+    /* If offer has zero port, just clone the offer */
     if (offer->desc.port == 0) {
-        answer = pjmedia_sdp_media_clone(pool, offer);
-        remove_all_media_directions(answer);
-        update_media_direction(pool, offer, answer);
+        answer = pjmedia_sdp_media_clone_deactivate(pool, offer);
         *p_answer = answer;
         return PJ_SUCCESS;
@@ -1357 +1361 @@
              * Reject the offer by setting the port to zero in the answer.
              */
-            //pjmedia_sdp_attr *a;
-
             /* For simplicity in the construction of the answer, we'll
              * just clone the media from the offer. Anyway receiver will
@@ -1364 +1366 @@
              * number is zero.
              */
-            am = pjmedia_sdp_media_clone(pool, om);
-            am->desc.port = 0;
-
-            // Just set port zero to disable stream without set it to inactive.
-            /* Remove direction attribute, and replace with inactive */
-            remove_all_media_directions(am);
-            //a = pjmedia_sdp_attr_create(pool, "inactive", NULL);
-            //pjmedia_sdp_media_add_attr(am, a);
-
-            /* Then update direction */
-            update_media_direction(pool, om, am);
-
+            am = pjmedia_sdp_media_clone_deactivate(pool, om);
         } else {
             /* The answer is in am */
@@ -1439 +1430 @@
             neg->active_local_sdp = active;
             neg->active_remote_sdp = neg->neg_remote_sdp;
-
         }
     } else {