Changeset 3708

Timestamp:

Aug 17, 2011 10:03:53 AM (13 years ago)

Author:

nanang

Message:

Re #1320: Fixed SDP negotiator in generating connection info for SDP media answer when the media is deactivated (was always adding connection line for the media, even if SDP session already has one).

File:

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

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

@@ -1126 +1126 @@
                                const pjmedia_sdp_media *offer,
                                const pjmedia_sdp_media *preanswer,
+                               const pjmedia_sdp_session *preanswer_sdp,
                                pjmedia_sdp_media **p_answer)
 {
@@ -1143 +1144 @@
     /* If offer has zero port, just clone the offer */
     if (offer->desc.port == 0) {
-        answer = sdp_media_clone_deactivate(pool, offer, preanswer, NULL);
+        answer = sdp_media_clone_deactivate(pool, offer, preanswer,
+                                            preanswer_sdp);
         *p_answer = answer;
         return PJ_SUCCESS;
@@ -1438 +1440 @@
                 /* See if it has matching codec. */
                 status = match_offer(pool, prefer_remote_codec_order, 
-                                     om, im, &am);
+                                     om, im, initial, &am);
                 if (status == PJ_SUCCESS) {
                     /* Mark media as used. */