Changeset 207

Timestamp:

Feb 21, 2006 11:41:33 PM (18 years ago)

Author:

bennylp

Message:

Added has_local_answer(), and more relaxed negotiation

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/sdp_neg.h (modified) (1 diff)
• src/pjmedia/sdp_neg.c (modified) (4 diffs)

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

@@ -533 +533 @@
 
 /**
+ * Call this function when the negotiator is in PJMEDIA_SDP_NEG_STATE_WAIT_NEGO
+ * state to see if it was local who is answering the offer (instead of
+ * remote).
+ *
+ * @param neg           The negotiator.
+ *
+ * @return              PJ_TRUE if it is local is answering an offer, PJ_FALSE
+ *                      if remote has answered local offer.
+ */
+PJ_DECL(pj_bool_t) pjmedia_sdp_neg_has_local_answer(pjmedia_sdp_neg *neg);
+
+
+/**
  * Negotiate local and remote answer. Before calling this function, the
  * SDP negotiator must be in PJMEDIA_SDP_NEG_STATE_WAIT_NEGO state.

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

@@ -329 +329 @@
     return PJ_SUCCESS;
 }
+
+PJ_DEF(pj_bool_t) pjmedia_sdp_neg_has_local_answer(pjmedia_sdp_neg *neg)
+{
+    pj_assert(neg && neg->state==PJMEDIA_SDP_NEG_STATE_WAIT_NEGO);
+    return !neg->has_remote_answer;
+}
+
 
 /* Swap string. */
@@ -694 +701 @@
 
     /* See if all types of offer can be matched. */
+#if 0
     if ((offer_has_codec && !found_matching_codec) ||
         (offer_has_telephone_event && !found_matching_telephone_event) ||
@@ -701 +709 @@
         return PJ_FALSE;
     }
+#else
+    PJ_TODO(FULL_MATCHING_WITH_TELEPHONE_EVENTS);
+    if (!found_matching_codec &&
+        !found_matching_telephone_event &&
+        !found_matching_other)
+    {
+        /* Some of the payload in the offer has no matching local sdp */
+        return PJ_FALSE;
+    }
+#endif
 
     /* Seems like everything is in order.
@@ -839 +857 @@
 
     return has_active ? PJ_SUCCESS : PJMEDIA_SDPNEG_ENOMEDIA;
+    //return PJ_SUCCESS;
 }