Changeset 4554 for pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h

Timestamp:

Jul 9, 2013 7:17:39 AM (10 years ago)

Author:

ming

Message:

Closed #1687: Allow media type change during SDP negotiation

File:

• pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h

@@ -314 +314 @@
 
 /**
+ * Flags to be given to pjmedia_sdp_neg_modify_local_offer2().
+ */
+typedef enum pjmedia_mod_offer_flag
+{
+   /**
+    * Allow media type in the SDP to be changed.
+    * When generating a new offer, in the case that a media line doesn't match
+    * the active SDP, the new media line will be considered to replace the
+    * existing media at the same position.
+    */
+   PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE = 1
+
+} pjmedia_mod_offer_flag;
+
+
+/**
  * Get the state string description of the specified state.
  *
@@ -494 +510 @@
 pjmedia_sdp_neg_get_neg_local( pjmedia_sdp_neg *neg,
                                const pjmedia_sdp_session **local);
+
+/**
+ * Modify local session with a new SDP and treat this as a new offer. 
+ * This function can only be called in state PJMEDIA_SDP_NEG_STATE_DONE.
+ * After calling this function, application can send the SDP as offer 
+ * to remote party, using signaling protocol such as SIP.
+ * The negotiator state will move to PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER,
+ * where it waits for SDP answer from remote. See also
+ * #pjmedia_sdp_neg_modify_local_offer2()
+ *
+ * @param pool          Pool to allocate memory. The pool's lifetime needs
+ *                      to be valid for the duration of the negotiator.
+ * @param neg           The SDP negotiator instance.
+ * @param local         The new local SDP.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate
+ *                      error code.
+ */
+PJ_DECL(pj_status_t) 
+pjmedia_sdp_neg_modify_local_offer( pj_pool_t *pool,
+                                    pjmedia_sdp_neg *neg,
+                                    const pjmedia_sdp_session *local);
 
 /**
@@ -506 +544 @@
  *                      to be valid for the duration of the negotiator.
  * @param neg           The SDP negotiator instance.
+ * @param flags         Bitmask from pjmedia_mod_offer_flag.
  * @param local         The new local SDP.
  *
@@ -512 +551 @@
  */
 PJ_DECL(pj_status_t) 
-pjmedia_sdp_neg_modify_local_offer( pj_pool_t *pool,
-                                    pjmedia_sdp_neg *neg,
-                                    const pjmedia_sdp_session *local);
+pjmedia_sdp_neg_modify_local_offer2( pj_pool_t *pool,
+                                     pjmedia_sdp_neg *neg,
+                                     unsigned flags,
+                                     const pjmedia_sdp_session *local);
 
 /**