Integrated pjmedia-codec library to pjsua

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@177 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 36 insertions, 0 deletions

diff --git a/pjsip/build/pjsip.dsw b/pjsip/build/pjsip.dsw
index 00310dc7..fc7d8026 100644
--- a/pjsip/build/pjsip.dsw
+++ b/pjsip/build/pjsip.dsw
@@ -51,6 +51,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "pjmedia_codec"=..\..\pjmedia\build\pjmedia_codec.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "pjsip++"=".\pjsip++.dsp" - Package Owner=<4>

 

 Package=<5>

@@ -116,6 +128,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name pjsdp

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name pjmedia_codec

+    End Project Dependency

 }}}

 

 ###############################################################################

diff --git a/pjsip/src/pjsua/main.c b/pjsip/src/pjsua/main.c
index 6b85bfaf..4bc1f6a9 100644
--- a/pjsip/src/pjsua/main.c
+++ b/pjsip/src/pjsua/main.c
@@ -144,8 +144,10 @@ static void pjsua_dump(void)
     pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
 
     pjsip_endpt_dump(pjsua.endpt, 1);
+    pjmedia_endpt_dump(pjsua.med_endpt);
     pjsip_ua_dump();
 
+
     /* Dump all invite sessions: */
     PJ_LOG(3,(THIS_FILE, "Dumping invite sessions:"));
 
diff --git a/pjsip/src/pjsua/pjsua.h b/pjsip/src/pjsua/pjsua.h
index f882e873..8f9b31c0 100644
--- a/pjsip/src/pjsua/pjsua.h
+++ b/pjsip/src/pjsua/pjsua.h
@@ -25,6 +25,9 @@
 /* Include all PJMEDIA headers. */
 #include <pjmedia.h>
 
+/* Include all PJMEDIA-CODEC headers. */
+#include <pjmedia-codec.h>
+
 /* Include all PJSIP-UA headers */
 #include <pjsip_ua.h>
 
diff --git a/pjsip/src/pjsua/pjsua_core.c b/pjsip/src/pjsua/pjsua_core.c
index 5e344301..6d7a28f7 100644
--- a/pjsip/src/pjsua/pjsua_core.c
+++ b/pjsip/src/pjsua/pjsua_core.c
@@ -466,6 +466,16 @@ pj_status_t pjsua_init(void)
 	return status;
     }
 
+    /* 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;
 }
@@ -663,6 +673,12 @@ pj_status_t pjsua_destroy(void)
 
     pjsua.quit_flag = 1;
 
+
+    /* Shutdown pjmedia-codec: */
+
+    pjmedia_codec_deinit();
+
+
     /* Destroy sound framework: 
      * (this should be done in pjmedia_shutdown())
      */