Changeset 177 for pjproject

Timestamp:

Feb 10, 2006 3:57:32 PM (19 years ago)

Author:

bennylp

Message:

Integrated pjmedia-codec library to pjsua

Location:

pjproject/trunk/pjsip

Files:

• build/pjsip.dsw (modified) (2 diffs)
• src/pjsua/main.c (modified) (1 diff)
• src/pjsua/pjsua.h (modified) (1 diff)
• src/pjsua/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjsip/build/pjsip.dsw

@@ -41 +41 @@
 
 Project: "pjmedia"=..\..\pjmedia\build\pjmedia.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "pjmedia_codec"=..\..\pjmedia\build\pjmedia_codec.dsp - Package Owner=<4>
 
 Package=<5>
@@ -117 +129 @@
     Project_Dep_Name pjsdp
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjmedia_codec
+    End Project Dependency
 }}}
 

pjproject/trunk/pjsip/src/pjsua/main.c

@@ -145 +145 @@
 
     pjsip_endpt_dump(pjsua.endpt, 1);
+    pjmedia_endpt_dump(pjsua.med_endpt);
     pjsip_ua_dump();
+
 
     /* Dump all invite sessions: */

pjproject/trunk/pjsip/src/pjsua/pjsua.h

@@ -25 +25 @@
 /* Include all PJMEDIA headers. */
 #include <pjmedia.h>
+
+/* Include all PJMEDIA-CODEC headers. */
+#include <pjmedia-codec.h>
 
 /* Include all PJSIP-UA headers */

pjproject/trunk/pjsip/src/pjsua/pjsua_core.c

@@ -467 +467 @@
     }
 
+    /* Init pjmedia-codecs: */
+
+    status = pjmedia_codec_init(pjsua.med_endpt);
+    if (status != PJ_SUCCESS) {
+        pj_caching_pool_destroy(&pjsua.cp);
+        pjsua_perror("Media codec initialization has returned error", status);
+        return status;
+    }
+
+
     /* Done. */
     return PJ_SUCCESS;
@@ -664 +674 @@
     pjsua.quit_flag = 1;
 
+
+    /* Shutdown pjmedia-codec: */
+
+    pjmedia_codec_deinit();
+
+
     /* Destroy sound framework: 
      * (this should be done in pjmedia_shutdown())