Changeset 3664 for pjproject/trunk/pjmedia/include/pjmedia/stream.h

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/include/pjmedia/stream.h (modified) (5 diffs)

pjproject/trunk/pjmedia/include/pjmedia/stream.h

@@ -33 +33 @@
 #include <pjmedia/rtcp.h>
 #include <pjmedia/transport.h>
+#include <pjmedia/vid_codec.h>
 #include <pj/sock.h>
 
@@ -88 +89 @@
  * its own RTP/RTCP socket pair.
  */
-struct pjmedia_stream_info
+typedef struct pjmedia_stream_info
 {
     pjmedia_type        type;       /**< Media type (audio, video)          */
@@ -134 +135 @@
                                          is enabled?                        */
 #endif
-};
-
-
-/**
- * @see pjmedia_stream_info.
- */
-typedef struct pjmedia_stream_info pjmedia_stream_info;
-
+} pjmedia_stream_info;
+
+
+/**
+ * This function will initialize the stream info based on information
+ * in both SDP session descriptors for the specified stream index. 
+ * The remaining information will be taken from default codec parameters. 
+ * If socket info array is specified, the socket will be copied to the 
+ * session info as well.
+ *
+ * @param si            Stream info structure to be initialized.
+ * @param pool          Pool to allocate memory.
+ * @param endpt         PJMEDIA endpoint instance.
+ * @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);
 
 
@@ -232 +251 @@
 
 /**
+ * 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()
@@ -372 +402 @@
                                  void *user_data);
 
+
 /**
  * @}