Re pjsip#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. git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/2.0-dev@3463 74dad513-b988-da41-8d7b-12977e46ad98
feczo · Mar 18, 2011 · bf26db1 · bf26db1
1 parent 135290d
commit bf26db1
Show file tree

Hide file tree

Showing 6 changed files with 609 additions and 273 deletions.
diff --git a/pjproject-vs8.sln b/pjproject-vs8.sln
@@ -109,23 +109,24 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpjproject", "pjsip-apps\build\libpjproject.vcproj", "{23D7679C-764C-4E02-8B29-BB882CEEEFE2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
-		{2A3F241E-682C-47E1-9543-DC28708B406A} = {2A3F241E-682C-47E1-9543-DC28708B406A}
-		{4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}
-		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
-		{4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA}
-		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
-		{6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
-		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
-		{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}
-		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
-		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
-		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
-		{B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
-		{DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
-		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
-		{E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}
-		{A1989FF3-9894-40F4-B5A6-6EA364476E45} = {A1989FF3-9894-40F4-B5A6-6EA364476E45}
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45} = {A1989FF3-9894-40F4-B5A6-6EA364476E45}
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
+		{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA}
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}
+		{2A3F241E-682C-47E1-9543-DC28708B406A} = {2A3F241E-682C-47E1-9543-DC28708B406A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python_pjsua", "pjsip-apps\build\python_pjsua.vcproj", "{0C91838B-3372-40B4-A764-DE075A4BC94B}"

diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
@@ -3052,34 +3052,49 @@ typedef struct pjsua_call_info
     /** The reason phrase describing the status. */
     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. */
     pjmedia_dir		media_dir;
 
     /** The conference port number for the first audio stream. */
     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
     {
 	/** Media index in SDP. */
 	unsigned		index;
 
-	/** Call media status. */
-	pjsua_call_media_status media_status;
+	/** Media type. */
+	pjmedia_type		type;
 
 	/** Media direction. */
-	pjmedia_dir		media_dir;
+	pjmedia_dir		dir;
 
-	/** The conference port number for the call. */
-	pjsua_conf_port_id	conf_slot;
-
-    } audio[4];
+	/** Call media status. */
+	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 
      *  established)

diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h
@@ -61,12 +61,17 @@ typedef struct pjsua_call_media
     union {
 	/** Audio stream */
 	struct {
-	    pjmedia_stream *stream;    /**< The media session.		    */
+	    pjmedia_stream *stream;    /**< The audio stream.		    */
 	    int		    conf_slot; /**< Slot # in conference bridge.    */
 	} a;
 
 	/** Video stream */
 	struct {
+	    pjmedia_vid_stream  *stream;    /**< The video stream.	    */
+	    pjmedia_vid_port	*capturer;  /**< Video capturer.	    */
+	    pjmedia_vid_port	*renderer;  /**< Video renderer.	    */
+	    pjmedia_converter	*conv_enc;  /**< Converter for encoding dir.*/
+	    pjmedia_converter	*conv_dec;  /**< Converter for decoding dir.*/
 	} v;
 
     } strm;
@@ -119,7 +124,7 @@ struct pjsua_call
 
     unsigned		 med_cnt;   /**< Number of media in SDP.	    */
     pjsua_call_media     media[PJSUA_MAX_CALL_MEDIA]; /**< Array of media   */
-    unsigned		 audio_idx; /**< Selected audio media.		    */
+    int			 audio_idx; /**< First active audio media.	    */
 
     pjsip_evsub		*xfer_sub;  /**< Xfer server subscription, if this
 					 call was triggered by xfer.	    */