Changeset 3463 for pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua.h

Timestamp:

Mar 18, 2011 7:54:50 AM (13 years ago)

Author:

nanang

Message:

Re #1201:

• Initial version of video stream integration into pjsua-lib.
• Replaced audio info array in pjsua_call_info with media info array.
• Added video media info into call dump.
• Fixed assertion caused by pjsua_set_state(NULL) logging after pjlib shutdown.

File:

• pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua.h (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua.h

@@ -3053 +3053 @@
     pj_str_t            last_status_text;
 
-    /** Call media status. */
+    /** Media status of the first audio stream. */
     pjsua_call_media_status media_status;
-
-    /** Number of active audio streams in this call */
-    unsigned            audio_cnt;
 
     /** Media direction of the first audio stream. */
@@ -3065 +3062 @@
     pjsua_conf_port_id  conf_slot;
 
-    /** Array of audio media stream information */
+    /** Number of media streams in this call */
+    unsigned            media_cnt;
+
+    /** Array of media stream information */
     struct
     {
@@ -3071 +3071 @@
         unsigned                index;
 
+        /** Media type. */
+        pjmedia_type            type;
+
+        /** Media direction. */
+        pjmedia_dir             dir;
+
         /** Call media status. */
-        pjsua_call_media_status media_status;
-
-        /** Media direction. */
-        pjmedia_dir             media_dir;
-
-        /** The conference port number for the call. */
-        pjsua_conf_port_id      conf_slot;
-
-    } audio[4];
+        pjsua_call_media_status status;
+
+        /** The specific media stream info. */
+        union {
+            /** Audio stream */
+            struct {
+                pjsua_conf_port_id   conf_slot; /**< The conference port
+                                                     number for the call.   */
+            } audio;
+
+            /** Video stream */
+            struct {
+                pjmedia_vid_port    *capturer;  /**< Video capturer.        */
+                pjmedia_vid_port    *renderer;  /**< Video renderer.        */
+            } video;
+        } stream;
+
+    } media[PJMEDIA_MAX_SDP_MEDIA];
 
     /** Up-to-date call connected duration (zero when call is not