Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/endpoint.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/endpoint.c (modified) (8 diffs)

pjproject/branches/projects/uwp/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 */
@@ -557 +562 @@
         attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
         attr->name = pj_str("fmtp");
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0
         attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-16");
+#else
+        attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-15");
+#endif
         m->attr[m->attr_count++] = attr;
     }
@@ -756 +765 @@
                                                    pjmedia_sdp_session **p_sdp)
 {
+    char tmp_addr[PJ_INET6_ADDRSTRLEN];
     pj_time_val tv;
     pjmedia_sdp_session *sdp;
@@ -771 +781 @@
     if (origin->addr.sa_family == pj_AF_INET()) {
         sdp->origin.addr_type = STR_IP4;
-        pj_strdup2(pool, &sdp->origin.addr,
-                   pj_inet_ntoa(origin->ipv4.sin_addr));
     } else if (origin->addr.sa_family == pj_AF_INET6()) {
-        char tmp_addr[PJ_INET6_ADDRSTRLEN];
-
         sdp->origin.addr_type = STR_IP6;
-        pj_strdup2(pool, &sdp->origin.addr,
-                   pj_sockaddr_print(origin, tmp_addr, sizeof(tmp_addr), 0));
-
     } else {
         pj_assert(!"Invalid address family");
         return PJ_EAFNOTSUP;
     }
+
+    pj_strdup2(pool, &sdp->origin.addr,
+               pj_sockaddr_print(origin, tmp_addr, sizeof(tmp_addr), 0));
 
     if (sess_name)