Changeset 4556 for pjproject/trunk

Timestamp:

Jul 10, 2013 4:43:52 AM (11 years ago)

Author:

ming

Message:

Re #1687: Add SDP negotiation flags in invite session

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (5 diffs)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -373 +373 @@
     unsigned             options;                   /**< Options in use.    */
     pjmedia_sdp_neg     *neg;                       /**< Negotiator.        */
+    unsigned             sdp_neg_flags;             /**< SDP neg flags.     */
     pjsip_transaction   *invite_tsx;                /**< 1st invite tsx.    */
     pjsip_tx_data       *invite_req;                /**< Saved invite req   */

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -1769 +1769 @@
 
             /* Feed the original offer to negotiator */
-            status = pjmedia_sdp_neg_modify_local_offer(inv->pool_prov, 
-                                                        inv->neg,
-                                                        reoffer_sdp);
+            status = pjmedia_sdp_neg_modify_local_offer2(inv->pool_prov, 
+                                                         inv->neg,
+                                                         inv->sdp_neg_flags,
+                                                         reoffer_sdp);
             if (status != PJ_SUCCESS) {
                 PJ_LOG(1,(inv->obj_name, "Error updating local offer for "
@@ -2131 +2132 @@
             status = pjsip_inv_set_sdp_answer(inv, sdp);
         }  else if (neg_state == PJMEDIA_SDP_NEG_STATE_DONE) {
-            status = pjmedia_sdp_neg_modify_local_offer(inv->pool,
-                                                        inv->neg, sdp);
+            status = pjmedia_sdp_neg_modify_local_offer2(inv->pool, inv->neg,
+                                                         inv->sdp_neg_flags,
+                                                         sdp);
         } else
             return PJMEDIA_SDPNEG_EINSTATE;
@@ -2599 +2601 @@
 
             case PJMEDIA_SDP_NEG_STATE_DONE:
-                status = pjmedia_sdp_neg_modify_local_offer(inv->pool_prov,
-                                                            inv->neg,
-                                                            new_offer);
+                status = pjmedia_sdp_neg_modify_local_offer2(
+                             inv->pool_prov, inv->neg,
+                             inv->sdp_neg_flags, new_offer);
                 if (status != PJ_SUCCESS)
                     goto on_return;
@@ -2661 +2663 @@
          * with correct SDP origin.
          */
-        status = pjmedia_sdp_neg_modify_local_offer(inv->pool_prov, inv->neg,
-                                                    offer);
+        status = pjmedia_sdp_neg_modify_local_offer2(inv->pool_prov, inv->neg,
+                                                     inv->sdp_neg_flags, offer);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -4359 +4361 @@
                          */
                         status = 
-                            pjmedia_sdp_neg_modify_local_offer(inv->pool_prov,
-                                                               inv->neg,
-                                                               sdp);
+                            pjmedia_sdp_neg_modify_local_offer2(
+                                inv->pool_prov, inv->neg,
+                                inv->sdp_neg_flags, sdp);
 
                         /* Retrieve the "fixed" offer from negotiator */