Changeset 4164 for pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

Timestamp:

Jun 12, 2012 8:27:52 AM (11 years ago)

Author:

nanang

Message:

Close #1534: done.

File:

• pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -3561 +3561 @@
 
 /**
+ * Call media information.
+ */
+typedef struct pjsua_call_media_info
+{
+    /** Media index in SDP. */
+    unsigned            index;
+
+    /** Media type. */
+    pjmedia_type        type;
+
+    /** Media direction. */
+    pjmedia_dir         dir;
+
+    /** Call media status. */
+    pjsua_call_media_status status;
+
+    /** The specific media stream info. */
+    union {
+        /** Audio stream */
+        struct {
+            /** The conference port number for the call.  */
+            pjsua_conf_port_id      conf_slot;
+        } aud;
+
+        /** Video stream */
+        struct {
+            /**
+             * The window id for incoming video, if any, or
+             * PJSUA_INVALID_ID.
+             */
+            pjsua_vid_win_id        win_in;
+
+            /** The video capture device for outgoing transmission,
+             *  if any, or PJMEDIA_VID_INVALID_DEV
+             */
+            pjmedia_vid_dev_index   cap_dev;
+
+        } vid;
+    } stream;
+
+} pjsua_call_media_info;
+
+
+/**
  * This structure describes the information and current status of a call.
  */
@@ -3613 +3657 @@
     pjsua_conf_port_id  conf_slot;
 
-    /** Number of media streams in this call */
+    /** Number of active media info in this call. */
     unsigned            media_cnt;
 
-    /** Array of media stream information */
-    struct
-    {
-        /** Media index in SDP. */
-        unsigned                index;
-
-        /** Media type. */
-        pjmedia_type            type;
-
-        /** Media direction. */
-        pjmedia_dir             dir;
-
-        /** Call media status. */
-        pjsua_call_media_status status;
-
-        /** The specific media stream info. */
-        union {
-            /** Audio stream */
-            struct {
-                /** The conference port number for the call.  */
-                pjsua_conf_port_id   conf_slot;
-            } aud;
-
-            /** Video stream */
-            struct {
-                /**
-                 * The window id for incoming video, if any, or
-                 * PJSUA_INVALID_ID.
-                 */
-                pjsua_vid_win_id     win_in;
-
-                /** The video capture device for outgoing transmission,
-                 *  if any, or PJMEDIA_VID_INVALID_DEV
-                 */
-                pjmedia_vid_dev_index   cap_dev;
-
-            } vid;
-        } stream;
-
-    } media[PJMEDIA_MAX_SDP_MEDIA];
+    /** Array of active media information. */
+    pjsua_call_media_info media[PJMEDIA_MAX_SDP_MEDIA];
+
+    /** Number of provisional media info in this call. */
+    unsigned            prov_media_cnt;
+
+    /** Array of provisional media information. This contains the media info
+     *  in the provisioning state, that is when the media session is being
+     *  created/updated (SDP offer/answer is on progress).
+     */
+    pjsua_call_media_info prov_media[PJMEDIA_MAX_SDP_MEDIA];
 
     /** Up-to-date call connected duration (zero when call is not