Ticket #1059: 1059.diff

pjsip/include/pjsua-lib/pjsua_internal.h

@@ -323 +323 @@
     pjmedia_snd_port    *snd_port;  /**< Sound port.                    */
     pj_timer_entry       snd_idle_timer;/**< Sound device idle timer.   */
     pjmedia_master_port *null_snd;  /**< Master port for null sound.    */
+    pj_bool_t            poll_null_snd; /**< Should poll master port?   */
     pjmedia_port        *null_port; /**< Null port.                     */
 
 

pjsip/src/pjsua-lib/pjsua_media.c

@@ -2721 +2721 @@
 /* Close existing sound device */
 static void close_snd_dev(void)
 {
+    /* Stop polling master port (for null audio device) */
+    pjsua_var.poll_null_snd = PJ_FALSE;
+
     /* Close sound device */
     if (pjsua_var.snd_port) {
         pjmedia_aud_dev_info cap_info, play_info;
@@ -2846 +2849 @@
 PJ_DEF(pj_status_t) pjsua_set_null_snd_dev(void)
 {
     pjmedia_port *conf_port;
+    unsigned master_port_opt = 0;
     pj_status_t status;
 
     /* Close existing sound device */
@@ -2861 +2865 @@
     conf_port = pjmedia_conf_get_master_port(pjsua_var.mconf);
     pj_assert(conf_port != NULL);
 
+    /* Ticket #1059: master port should avoid thread creation when media
+     * subsystem is configured with zero thread.
+     *
+     * Exception applies for Symbian platforms, as it can still achieve
+     * asynchronous timer using Active Object (instead of thread).
+     */
+#if !defined(PJ_SYMBIAN) || PJ_SYMBIAN == 0
+    if (pjsua_var.media_cfg.thread_cnt == 0) {
+        master_port_opt |= PJMEDIA_CLOCK_NO_ASYNC;
+        pjsua_var.poll_null_snd = PJ_TRUE;
+    }
+#endif
+
     /* Create master port, connecting port0 of the conference bridge to
      * a null port.
      */
     status = pjmedia_master_port_create(pjsua_var.snd_pool, pjsua_var.null_port,
-                                        conf_port, 0, &pjsua_var.null_snd);
+                                        conf_port, master_port_opt,
+                                        &pjsua_var.null_snd);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create null sound device",
                      status);

pjsip/src/pjsua-lib/pjsua_core.c

@@ -1457 +1457 @@
     pj_time_val tv;
     pj_status_t status;
 
+    /* Poll master port (for null audio device) */
+    if (pjsua_var.poll_null_snd) {
+        while (pjmedia_master_port_wait(pjsua_var.null_snd, PJ_FALSE, NULL));
+    }
+
     tv.sec = 0;
     tv.msec = msec_timeout;
     pj_time_val_normalize(&tv);