Changeset 3446

Timestamp:

Mar 15, 2011 11:20:35 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1207: Deprecation of pjmedia_session:

• add new APIs in stream so that app can use this directly instead of via session
• moved some APIs from session to stream

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• include/pjmedia/stream.h (modified) (3 diffs)
• src/pjmedia/session.c (modified) (2 diffs)
• src/pjmedia/stream.c (modified) (6 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/stream.h

@@ -89 +89 @@
  * its own RTP/RTCP socket pair.
  */
-struct pjmedia_stream_info
+typedef struct pjmedia_stream_info
 {
     pjmedia_type        type;       /**< Media type (audio, video)          */
@@ -135 +135 @@
                                          is enabled?                        */
 #endif
-};
-
-
-/**
- * @see pjmedia_stream_info.
- */
-typedef struct pjmedia_stream_info pjmedia_stream_info;
+} pjmedia_stream_info;
 
 
@@ -247 +241 @@
 
 /**
+ * Get the stream info.
+ *
+ * @param stream        The media stream.
+ * @param info          Stream info.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_stream_get_info( const pjmedia_stream *stream,
+                                              pjmedia_stream_info *info);
+
+/**
  * Get the stream statistics. See also
  * #pjmedia_stream_get_stat_jbuf()

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/session.c

@@ -141 +141 @@
 }
 
-
+#if 0   // Moved to stream.c
 /*
  * Create stream info from SDP media line.
@@ -605 +605 @@
     return PJ_SUCCESS;
 }
-
+#endif
 
 /*

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/stream.c

@@ -66 +66 @@
 #endif
 
+#ifndef PJMEDIA_STREAM_SIZE
+#   define PJMEDIA_STREAM_SIZE  1000
+#endif
+
+#ifndef PJMEDIA_STREAM_INC
+#   define PJMEDIA_STREAM_INC   1000
+#endif
 
 
@@ -101 +108 @@
     pjmedia_endpt           *endpt;         /**< Media endpoint.            */
     pjmedia_codec_mgr       *codec_mgr;     /**< Codec manager instance.    */
-
+    pjmedia_stream_info      si;            /**< Creation parameter.        */
     pjmedia_port             port;          /**< Port interface.            */
     pjmedia_channel         *enc;           /**< Encoding channel.          */
     pjmedia_channel         *dec;           /**< Decoding channel.          */
+
+    pj_pool_t               *own_pool;      /**< Only created if not given  */
 
     pjmedia_dir              dir;           /**< Stream direction.          */
@@ -1944 +1953 @@
     unsigned jb_init, jb_max, jb_min_pre, jb_max_pre, len;
     pjmedia_audio_format_detail *afd;
+    pj_pool_t *own_pool = NULL;
     char *p;
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(pool && info && p_stream, PJ_EINVAL);
+    PJ_ASSERT_RETURN(endpt && info && p_stream, PJ_EINVAL);
+
+    if (pool == NULL) {
+        own_pool = pjmedia_endpt_create_pool( endpt, "strm%p",
+                                              PJMEDIA_STREAM_SIZE,
+                                              PJMEDIA_STREAM_INC);
+        PJ_ASSERT_RETURN(own_pool != NULL, PJ_ENOMEM);
+        pool = own_pool;
+    }
 
     /* Allocate the media stream: */
@@ -1953 +1971 @@
     stream = PJ_POOL_ZALLOC_T(pool, pjmedia_stream);
     PJ_ASSERT_RETURN(stream != NULL, PJ_ENOMEM);
+    stream->own_pool = own_pool;
+    pj_memcpy(&stream->si, info, sizeof(*info));
 
     /* Init stream/port name */
@@ -2443 +2463 @@
 #endif
 
+    if (stream->own_pool) {
+        pj_pool_t *pool = stream->own_pool;
+        stream->own_pool = NULL;
+        pj_pool_release(pool);
+    }
     return PJ_SUCCESS;
 }
@@ -2495 +2520 @@
 }
 
+
+PJ_DEF(pj_status_t) pjmedia_stream_get_info( const pjmedia_stream *stream,
+                                             pjmedia_stream_info *info)
+{
+    PJ_ASSERT_RETURN(stream && info, PJ_EINVAL);
+
+    pj_memcpy(info, &stream->si, sizeof(pjmedia_stream_info));
+    return PJ_SUCCESS;
+}
 
 /*