Changeset 5255 for pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

Timestamp:

Mar 10, 2016 5:02:07 AM (8 years ago)

Author:

ming

Message:

Fixed #1907: Remove pjmedia* circular dependency

File:

• pjproject/trunk/pjmedia/src/pjmedia/endpoint.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -106 +106 @@
  * Initialize and get the instance of media endpoint.
  */
-PJ_DEF(pj_status_t) pjmedia_endpt_create(pj_pool_factory *pf,
-                                         pj_ioqueue_t *ioqueue,
-                                         unsigned worker_cnt,
-                                         pjmedia_endpt **p_endpt)
+PJ_DEF(pj_status_t) pjmedia_endpt_create2(pj_pool_factory *pf,
+                                          pj_ioqueue_t *ioqueue,
+                                          unsigned worker_cnt,
+                                          pjmedia_endpt **p_endpt)
 {
     pj_pool_t *pool;
@@ -134 +134 @@
     endpt->has_telephone_event = PJ_TRUE;
 
-    /* Sound */
-    status = pjmedia_aud_subsys_init(pf);
-    if (status != PJ_SUCCESS)
-        goto on_error;
+    /* Initialize audio subsystem.
+     * To avoid pjmedia's dependendy on pjmedia-audiodev, the initialization
+     * (and shutdown) of audio subsystem will be done in the application
+     * level instead, when it calls inline functions pjmedia_endpt_create()
+     * and pjmedia_endpt_destroy().
+     */
+    //status = pjmedia_aud_subsys_init(pf);
+    //if (status != PJ_SUCCESS)
+    //  goto on_error;
 
     /* Init codec manager. */
@@ -189 +194 @@
 
     pjmedia_codec_mgr_destroy(&endpt->codec_mgr);
-    pjmedia_aud_subsys_shutdown();
+    //pjmedia_aud_subsys_shutdown();
     pj_pool_release(pool);
     return status;
@@ -205 +210 @@
  * Deinitialize media endpoint.
  */
-PJ_DEF(pj_status_t) pjmedia_endpt_destroy (pjmedia_endpt *endpt)
+PJ_DEF(pj_status_t) pjmedia_endpt_destroy2 (pjmedia_endpt *endpt)
 {
     exit_cb *ecb;
@@ -220 +225 @@
 
     pjmedia_codec_mgr_destroy(&endpt->codec_mgr);
-    pjmedia_aud_subsys_shutdown();
+    //pjmedia_aud_subsys_shutdown();
 
     /* Call all registered exit callbacks */