Changeset 374

Timestamp:

Apr 3, 2006 10:32:49 PM (19 years ago)

Author:

bennylp

Message:

Moved private create session info from SDP to public API

Location:

pjproject/trunk/pjmedia

Files:

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

pjproject/trunk/pjmedia/include/pjmedia/session.h

@@ -65 +65 @@
     pjmedia_stream_info stream_info[PJMEDIA_MAX_SDP_MEDIA];
 };
+
+
+/**
+ * Initialize stream info from SDP media lines.
+ *
+ * @param si            Stream info structure to be initialized.
+ * @param pool          Pool.
+ * @param endpt         Pjmedia endpoint.
+ * @param local         Local SDP session descriptor.
+ * @param remote        Remote SDP session descriptor.
+ * @param stream_idx    Media stream index in the session descriptor.
+ *
+ * @return              PJ_SUCCESS if stream info is successfully initialized.
+ */
+PJ_DECL(pj_status_t) pjmedia_stream_info_from_sdp( 
+                                           pjmedia_stream_info *si,
+                                           pj_pool_t *pool,
+                                           pjmedia_endpt *endpt,
+                                           const pjmedia_sdp_session *local,
+                                           const pjmedia_sdp_session *remote,
+                                           unsigned stream_idx);
 
 

pjproject/trunk/pjmedia/src/pjmedia/session.c

@@ -60 +60 @@
  * Create stream info from SDP media line.
  */
-static pj_status_t create_stream_info_from_sdp(pj_pool_t *pool,
-                                               pjmedia_endpt *endpt,
-                                               pjmedia_stream_info *si,
-                                               const pjmedia_sdp_conn *local_conn,
-                                               const pjmedia_sdp_conn *rem_conn,
-                                               const pjmedia_sdp_media *local_m,
-                                               const pjmedia_sdp_media *rem_m)
+PJ_DEF(pj_status_t) pjmedia_stream_info_from_sdp(
+                                           pjmedia_stream_info *si,
+                                           pj_pool_t *pool,
+                                           pjmedia_endpt *endpt,
+                                           const pjmedia_sdp_session *local,
+                                           const pjmedia_sdp_session *remote,
+                                           unsigned stream_idx)
 {
     const pjmedia_sdp_attr *attr;
+    const pjmedia_sdp_media *local_m;
+    const pjmedia_sdp_media *rem_m;
+    const pjmedia_sdp_conn *local_conn;
+    const pjmedia_sdp_conn *rem_conn;
     pjmedia_sdp_rtpmap *rtpmap;
     unsigned i, pt;
@@ -74 +78 @@
 
 
+    
     /* Validate arguments: */
-
-    PJ_ASSERT_RETURN(pool && si && local_conn && rem_conn &&
-                     local_m && rem_m, PJ_EINVAL);
+    PJ_ASSERT_RETURN(pool && si && local && remote, PJ_EINVAL);
+    PJ_ASSERT_RETURN(stream_idx < local->media_count, PJ_EINVAL);
+    PJ_ASSERT_RETURN(stream_idx < remote->media_count, PJ_EINVAL);
+
+
+    local_m = local->media[stream_idx];
+    rem_m = remote->media[stream_idx];
+
+    local_conn = local_m->conn ? local_m->conn : local->conn;
+    if (local_conn == NULL)
+        return PJMEDIA_SDP_EMISSINGCONN;
+
+    rem_conn = rem_m->conn ? rem_m->conn : remote->conn;
+    if (rem_conn == NULL)
+        return PJMEDIA_SDP_EMISSINGCONN;
+
 
     /* Reset: */
@@ -156 +174 @@
      */
     if (pt < 96) {
-        
-        pjmedia_codec_mgr *mgr;
-
-        mgr = pjmedia_endpt_get_codec_mgr(endpt);
-
-        status = pjmedia_codec_mgr_get_codec_info( mgr, pt, &si->fmt);
-        if (status != PJ_SUCCESS)
-            return status;
+        pj_bool_t has_rtpmap;
+
+        rtpmap = NULL;
+        has_rtpmap = PJ_TRUE;
+
+        attr = pjmedia_sdp_media_find_attr(local_m, &ID_RTPMAP, 
+                                           &local_m->desc.fmt[0]);
+        if (attr == NULL) {
+            has_rtpmap = PJ_FALSE;
+        }
+        if (attr != NULL) {
+            status = pjmedia_sdp_attr_to_rtpmap(pool, attr, &rtpmap);
+            if (status != PJ_SUCCESS)
+                has_rtpmap = PJ_FALSE;
+        }
+
+        /* Build codec format info: */
+        if (has_rtpmap) {
+            si->fmt.type = si->type;
+            si->fmt.pt = pj_strtoul(&local_m->desc.fmt[0]);
+            pj_strdup(pool, &si->fmt.encoding_name, &rtpmap->enc_name);
+            si->fmt.sample_rate = rtpmap->clock_rate;
+
+        } else {
+            pjmedia_codec_mgr *mgr;
+
+            mgr = pjmedia_endpt_get_codec_mgr(endpt);
+
+            status = pjmedia_codec_mgr_get_codec_info( mgr, pt, &si->fmt);
+            if (status != PJ_SUCCESS)
+                return status;
+        }
 
         /* For static payload type, pt's are symetric */
@@ -304 +346 @@
 
         pjmedia_stream_info *si = &session->stream_info[i];
-        const pjmedia_sdp_media *local_m = local_sdp->media[i];
-        const pjmedia_sdp_media *rem_m = rem_sdp->media[i];
-        pjmedia_sdp_conn *local_conn, *rem_conn;
 
         /* Build stream info based on media line in local SDP */
-        local_conn = local_m->conn ? local_m->conn : local_sdp->conn;
-        rem_conn = rem_m->conn ? rem_m->conn : rem_sdp->conn;
-
-        status = create_stream_info_from_sdp(session->pool, endpt, si,
-                                             local_conn, rem_conn,
-                                             local_m, rem_m);
+        status = pjmedia_stream_info_from_sdp(si, session->pool, endpt,
+                                              local_sdp, rem_sdp, i);
         if (status != PJ_SUCCESS)
             return status;