Changeset 3198 for pjproject/trunk/pjmedia/src/pjmedia/sdp.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.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -1431 +1431 @@
                                                  pjmedia_sdp_media *m)
 {
-    pjmedia_sdp_attr *attr;
-    static const pj_str_t ID_INACTIVE = { "inactive", 8 };
-
-    if (m->attr_count >= PJMEDIA_MAX_SDP_ATTR)
-        return PJ_ETOOMANY;
-
-    attr = pjmedia_sdp_attr_create(pool, ID_INACTIVE.ptr, NULL);
-    if (NULL == attr)
-        return PJ_ENOMEM;
-
-    pjmedia_sdp_media_add_attr(m, attr);
+    PJ_ASSERT_RETURN(m, PJ_EINVAL);
+    PJ_UNUSED_ARG(pool);
+
+    /* Set port to zero */
     m->desc.port = 0;
 
+    /* And remove attributes */
+    m->attr_count = 0;
+
     return PJ_SUCCESS;
 }
+
+
+PJ_DEF(pjmedia_sdp_media*) pjmedia_sdp_media_clone_deactivate(
+                                                pj_pool_t *pool,
+                                                const pjmedia_sdp_media *rhs)
+{
+    unsigned int i;
+    pjmedia_sdp_media *m;
+
+    PJ_ASSERT_RETURN(pool && rhs, NULL);
+
+    m = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
+    pj_memcpy(m, rhs, sizeof(*m));
+
+    /* Clone the media line only */
+    pj_strdup (pool, &m->desc.media, &rhs->desc.media);
+    pj_strdup (pool, &m->desc.transport, &rhs->desc.transport);
+    for (i=0; i<rhs->desc.fmt_count; ++i)
+        pj_strdup(pool, &m->desc.fmt[i], &rhs->desc.fmt[i]);
+
+    if (rhs->conn) {
+        m->conn = pjmedia_sdp_conn_clone (pool, rhs->conn);
+        PJ_ASSERT_RETURN(m->conn != NULL, NULL);
+    }
+
+    /* And deactivate it */
+    pjmedia_sdp_media_deactivate(pool, m);
+
+    return m;
+}